diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-06 01:02:57 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-06 01:02:57 +0000 |
| commit | 97e99cabe32457b9df261ea64fa835c2f8850d2e (patch) | |
| tree | e7ccff176788446a96cdfdb3e7827e070d320340 | |
| parent | 138dc7f32a3c64cc87bf83d4ac9d1bc83036e49b (diff) | |
| download | hercules-97e99cabe32457b9df261ea64fa835c2f8850d2e.tar.gz hercules-97e99cabe32457b9df261ea64fa835c2f8850d2e.tar.bz2 hercules-97e99cabe32457b9df261ea64fa835c2f8850d2e.tar.xz hercules-97e99cabe32457b9df261ea64fa835c2f8850d2e.zip | |
* 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).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14694 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b95452366..d1cac7b12 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 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] 2011/02/02 * Fixed non-windows 'findfile' utils function missing a 'closedir' call (bugreport:4739, since r1629). [Ai4rei] diff --git a/src/map/script.c b/src/map/script.c index 5c87336c3..9d36802a2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1253,7 +1253,9 @@ const char* parse_curly_close(const char* p) set_label(l,script_pos, p); linkdb_final(&syntax.curly[pos].case_label); // free the list of case label syntax.curly_count--; - return p+1; + // if, for , while ‚̕‚¶”»’è + p = parse_syntax_close(p + 1); + return p; } else { disp_error_message("parse_curly_close: unexpected string",p); return p + 1; |