[Scummvm-cvs-logs] SF.net SVN: scummvm: [29158] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 29158
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29158&view=rev
Author:   peres001
Date:     2007-10-06 14:15:53 -0700 (Sat, 06 Oct 2007)

Log Message:
-----------
Fixed bug #1808615. An unexpected (but harmless) 'ENDCOMMANDS' statement was spotted in the game scripts by the new stricter parser.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parser_ns.cpp
    scummvm/trunk/engines/parallaction/staticres.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-10-06 20:56:17 UTC (rev 29157)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-10-06 21:15:53 UTC (rev 29158)
@@ -745,6 +745,7 @@
 	DECLARE_UNQUALIFIED_ZONE_PARSER(label);
 	DECLARE_UNQUALIFIED_ZONE_PARSER(flags);
 	DECLARE_UNQUALIFIED_ZONE_PARSER(endzone);
+	DECLARE_UNQUALIFIED_ZONE_PARSER(null);
 	DECLARE_UNQUALIFIED_ANIM_PARSER(invalid);
 	DECLARE_UNQUALIFIED_ANIM_PARSER(script);
 	DECLARE_UNQUALIFIED_ANIM_PARSER(commands);

Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp	2007-10-06 20:56:17 UTC (rev 29157)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp	2007-10-06 21:15:53 UTC (rev 29158)
@@ -1136,7 +1136,8 @@
 		ZONE_PARSER(commands),
 		ZONE_PARSER(label),
 		ZONE_PARSER(flags),
-		ZONE_PARSER(endzone)
+		ZONE_PARSER(endzone),
+		ZONE_PARSER(null)
 	};
 
 	for (i = 0; i < ARRAYSIZE(op5); i++)
@@ -1190,7 +1191,11 @@
 	return v194;
 }
 
+DECLARE_ZONE_PARSER(null) {
+	debugC(7, kDebugParser, "ZONE_PARSER(null) ");
+}
 
+
 DECLARE_ZONE_PARSER(invalid)  {
 	debugC(7, kDebugParser, "ZONE_PARSER(invalid) ");
 

Modified: scummvm/trunk/engines/parallaction/staticres.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/staticres.cpp	2007-10-06 20:56:17 UTC (rev 29157)
+++ scummvm/trunk/engines/parallaction/staticres.cpp	2007-10-06 21:15:53 UTC (rev 29158)
@@ -343,7 +343,8 @@
 	"commands",
 	"label",
 	"flags",
-	"endzone"
+	"endzone",
+	"endcommands"		// this to prevent unexpected statements in the scripts to crash the parser
 };
 
 const char *_locationAnimStmtRes_ns[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.