Jelajahi Sumber

* 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://svn.code.sf.net/p/rathena/svn/trunk@14694 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 tahun lalu
induk
melakukan
0045508031
2 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 1 0
      Changelog-Trunk.txt
  2. 3 1
      src/map/script.c

+ 1 - 0
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]

+ 3 - 1
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;