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

* Fixed closing 'switch' curly not causing script EOL processing to trigger, leading to the script line after the switch being handled as belonging to the curly-less statement block (bugreport:3273, since r3422).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14694 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-02-06 01:02:57 +00:00
parent 6cbc16833f
commit 0045508031
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added Date Added
2011/02/05 2011/02/05
* Fixed closing 'switch' curly not causing script EOL processing to trigger, leading to the script line after the switch being handled as belonging to the curly-less statement block (bugreport:3273, since r3422). [Ai4rei]
* Removed unnecessary getlogincount.pl, mapcheck.sh and mapchecker.sh tools (topic:262934). [Ai4rei] * Removed unnecessary getlogincount.pl, mapcheck.sh and mapchecker.sh tools (topic:262934). [Ai4rei]
2011/02/02 2011/02/02
* Fixed non-windows 'findfile' utils function missing a 'closedir' call (bugreport:4739, since r1629). [Ai4rei] * Fixed non-windows 'findfile' utils function missing a 'closedir' call (bugreport:4739, since r1629). [Ai4rei]

4
src/map/script.c
View File

@ -1253,7 +1253,9 @@ const char* parse_curly_close(const char* p)
set_label(l,script_pos, p); set_label(l,script_pos, p);
linkdb_final(&syntax.curly[pos].case_label); // free the list of case label linkdb_final(&syntax.curly[pos].case_label); // free the list of case label
syntax.curly_count--; syntax.curly_count--;
return p+1; // if, for , while の閉じ判定
p = parse_syntax_close(p + 1);
return p;
} else { } else {
disp_error_message("parse_curly_close: unexpected string",p); disp_error_message("parse_curly_close: unexpected string",p);
return p + 1; return p + 1;