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

Fixed segmentation fault in script engine when activating DEBUG_RUN flag

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7970 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2006-07-29 15:10:00 +00:00
parent c6f1e079fb
commit 8dca441de7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
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.
2006/07/29
* Fixed segmentation fault in script engine when activating DEBUG_RUN flag [Toms]
2006/07/28 2006/07/28
* Added Ishizu's code to check ammo type on attack. No more using Grenade * Added Ishizu's code to check ammo type on attack. No more using Grenade
rounds with Guns. [Skotlex] rounds with Guns. [Skotlex]

2
src/map/script.c
View File

@ -2458,6 +2458,7 @@ int run_func(struct script_state *st)
int i,start_sp,end_sp,func; int i,start_sp,end_sp,func;
end_sp=st->stack->sp; end_sp=st->stack->sp;
func=st->stack->stack_data[st->start].u.num;
#ifdef DEBUG_RUN #ifdef DEBUG_RUN
if(battle_config.etc_log) { if(battle_config.etc_log) {
ShowDebug("run_func : %s? (%d(%d)) sp=%d (%d...%d)\n",str_buf+str_data[func].str, func, str_data[func].type, st->stack->sp, st->start, st->end); ShowDebug("run_func : %s? (%d(%d)) sp=%d (%d...%d)\n",str_buf+str_data[func].str, func, str_data[func].type, st->stack->sp, st->start, st->end);
@ -2502,7 +2503,6 @@ int run_func(struct script_state *st)
st->start=i-1; st->start=i-1;
st->end=end_sp; st->end=end_sp;
func=st->stack->stack_data[st->start].u.num;
if(str_data[func].type!=C_FUNC ){ if(str_data[func].type!=C_FUNC ){
ShowMessage ("run_func: '"CL_WHITE"%s"CL_RESET"' (type %d) is not function and command!\n"); ShowMessage ("run_func: '"CL_WHITE"%s"CL_RESET"' (type %d) is not function and command!\n");
// st->stack->sp=0; // st->stack->sp=0;