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

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sat Dec 8 12:07:04 CET 2007


Revision: 29763
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29763&view=rev
Author:   peres001
Date:     2007-12-08 03:07:03 -0800 (Sat, 08 Dec 2007)

Log Message:
-----------
Fix for bug #1837503. Location switches can be scheduled recursively, so now flags needed to be handled in a safer way to prevent inconsistencies.

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

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-12-08 10:30:43 UTC (rev 29762)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-12-08 11:07:03 UTC (rev 29763)
@@ -370,6 +370,10 @@
 	_gfx->setBlackPalette();
 	_gfx->updateScreen();
 
+    // BUG #1837503: kEngineChangeLocation flag must be cleared *before* commands
+    // and acommands are executed, so that it can be set again if needed.
+	_engineFlags &= ~kEngineChangeLocation;
+
 	runCommands(_location._commands);
 
 	doLocationEnterTransition();
@@ -381,8 +385,6 @@
 
 	debugC(1, kDebugExec, "changeLocation() done");
 
-	_engineFlags &= ~kEngineChangeLocation;
-
 	return;
 
 }


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




More information about the Scummvm-git-logs mailing list