[Scummvm-cvs-logs] SF.net SVN: scummvm:[45753] scummvm/trunk/engines/draci/game.cpp

[spalek at users.sourceforge.net]

Revision: 45753
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45753&view=rev
Author:   spalek
Date:     2009-11-08 18:55:41 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Fix running clearing IsReloaded().

Currently, if gate programs used loop(), they exitted immediately due to not
having cleared this flag.

Modified Paths:
--------------
    scummvm/trunk/engines/draci/game.cpp

Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp	2009-11-08 18:55:18 UTC (rev 45752)
+++ scummvm/trunk/engines/draci/game.cpp	2009-11-08 18:55:41 UTC (rev 45753)
@@ -444,6 +444,7 @@
 	bool walkingFinished = false;
 	if (_walkingState.isActive()) {
 		walkingFinished = !_walkingState.continueWalkingOrClearPath();
+		// If walking has finished, the path won't be active anymore.
 	}
 
 	// Advance animations (this may also call setExitLoop(true) in the
@@ -1355,6 +1356,7 @@
 		// If the game has been reloaded, force reloading all animations.
 		return true;
 	}
+	setIsReloaded(false);
 	debugC(1, kDraciLogicDebugLevel, "Entering room %d using gate %d", _newRoom, _newGate);
 	_vm->_mouse->cursorOff();
 
@@ -1444,7 +1446,6 @@
 	// Reset the loop status.
 	setLoopStatus(kStatusOrdinary);
 
-	setIsReloaded(false);
 	if (_vm->_script->shouldEndProgram()) {
 		// Escape pressed during the intro or map animations run in the
 		// init scripts.  This flag was turned on to skip the rest of


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