summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 04:01:42 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 04:01:42 +0000
commit190eab1994cf4dcc04bba32a53057cab28910a9e (patch)
tree7209681878cbd273ebb85de42cc1f1969b50183f /src/map
parent8f4b6a735e96dcf5ae00b2eb755914c30be68a68 (diff)
downloadhercules-190eab1994cf4dcc04bba32a53057cab28910a9e.tar.gz
hercules-190eab1994cf4dcc04bba32a53057cab28910a9e.tar.bz2
hercules-190eab1994cf4dcc04bba32a53057cab28910a9e.tar.xz
hercules-190eab1994cf4dcc04bba32a53057cab28910a9e.zip
Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14424 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 4304aeea7..b37c31c1e 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9068,8 +9068,13 @@ BUILDIN_FUNC(warpwaitingpc)
*------------------------------------------*/
BUILDIN_FUNC(attachrid)
{
- st->rid=script_getnum(st,2);
- script_pushint(st,(map_id2sd(st->rid)!=NULL));
+ int rid = script_getnum(st,2);
+
+ if (map_id2sd(rid)) {
+ st->rid = rid;
+ script_pushint(st,1);
+ } else
+ script_pushint(st,0);
return 0;
}
/*==========================================