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

[peres001 at users.sourceforge.net]

Revision: 49428
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49428&view=rev
Author:   peres001
Date:     2010-06-04 13:48:09 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Ensure that zones/animations always get the same index number.

When a zone/animation is skipped by the parser because already
loaded, the index is now increased. This does not affect NS, since
indexes are only used for scene sorting there, but is relevant for
BRA, where indexes need to be coherent across location changes.

Patch #3004008 by fuzzie.

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

Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp	2010-06-04 12:51:06 UTC (rev 49427)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp	2010-06-04 13:48:09 UTC (rev 49428)
@@ -286,6 +286,7 @@
 	debugC(5, kDebugParser, "parseAnimation(name: %s)", name);
 
 	if (_vm->_location.findAnimation(name)) {
+		_zoneProg++;
 		_script->skip("endanimation");
 		return;
 	}
@@ -1305,6 +1306,7 @@
 	debugC(5, kDebugParser, "parseZone(name: %s)", name);
 
 	if (_vm->_location.findZone(name)) {
+		_zoneProg++;
 		_script->skip("endzone");
 		return;
 	}


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