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

[spalek at users.sourceforge.net]

Revision: 44590
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44590&view=rev
Author:   spalek
Date:     2009-10-04 09:33:07 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
Hack Game::_shouldExitLoop.

Immediate exit needed when loading a savegame hurts waiting in an inner
(strange) loop inside a GPL program, because animations don't progress at
all.  Reverted to the previous behavior and kept the immediate exit as a
hack for loading the game.

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

Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp	2009-10-04 09:31:37 UTC (rev 44589)
+++ scummvm/trunk/engines/draci/game.cpp	2009-10-04 09:33:07 UTC (rev 44590)
@@ -226,7 +226,7 @@
 		_loopStatus, _loopSubstatus);
 
 		_vm->handleEvents();
-		if (shouldExitLoop())	// after loading
+		if (shouldExitLoop() > 1)	// after loading
 			break;
 
 		// Fetch mouse coordinates

Modified: scummvm/trunk/engines/draci/game.h
===================================================================
--- scummvm/trunk/engines/draci/game.h	2009-10-04 09:31:37 UTC (rev 44589)
+++ scummvm/trunk/engines/draci/game.h	2009-10-04 09:33:07 UTC (rev 44590)
@@ -305,8 +305,8 @@
 	bool shouldQuit() const { return _shouldQuit; }
 	void setQuit(bool quit) { _shouldQuit = quit; }
 
-	bool shouldExitLoop() const { return _shouldExitLoop; }
-	void setExitLoop(bool exit) { _shouldExitLoop = exit; }
+	int shouldExitLoop() const { return _shouldExitLoop; }
+	void setExitLoop(int exit) { _shouldExitLoop = exit; }
 
 	void setSpeechTick(uint tick);
 
@@ -388,7 +388,7 @@
 	LoopSubstatus _loopSubstatus;
 
 	bool _shouldQuit;
-	bool _shouldExitLoop;
+	int _shouldExitLoop;	// 0=false and 1=true are normal, 2=immediate exit after loading
 
 	uint _speechTick;
 

Modified: scummvm/trunk/engines/draci/saveload.cpp
===================================================================
--- scummvm/trunk/engines/draci/saveload.cpp	2009-10-04 09:31:37 UTC (rev 44589)
+++ scummvm/trunk/engines/draci/saveload.cpp	2009-10-04 09:33:07 UTC (rev 44590)
@@ -147,7 +147,7 @@
 	vm->_engineStartTime = vm->_system->getMillis() / 1000 - header.playtime;
 	vm->_game->scheduleEnteringRoomUsingGate(vm->_game->getRoomNum(), 0);
 	vm->_game->setRoomNum(oldRoomNum);
-	vm->_game->setExitLoop(true);
+	vm->_game->setExitLoop(2);	// 2 > true means immediate exit for the loop
 
 	vm->_game->inventoryReload();
 


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