Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14424 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Paradox924X 2010-10-11 04:01:42 +00:00
parent 80df86d7f7
commit bed93164f2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2010/10/10 2010/10/10
* Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470) [Paradox924X]
* Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X] * Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X]
* Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) [Paradox924X] * Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) [Paradox924X]
* Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X] * Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X]

9
src/map/script.c
View File

@ -9068,8 +9068,13 @@ BUILDIN_FUNC(warpwaitingpc)
*------------------------------------------*/ *------------------------------------------*/
BUILDIN_FUNC(attachrid) BUILDIN_FUNC(attachrid)
{ {
st->rid=script_getnum(st,2); int rid = script_getnum(st,2);
script_pushint(st,(map_id2sd(st->rid)!=NULL));
if (map_id2sd(rid)) {
st->rid = rid;
script_pushint(st,1);
} else
script_pushint(st,0);
return 0; return 0;
} }
/*========================================== /*==========================================