[Scummvm-cvs-logs] SF.net SVN: scummvm:[35980] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Jan 21 16:36:32 CET 2009


Revision: 35980
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35980&view=rev
Author:   lordhoto
Date:     2009-01-21 15:36:31 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Fixed GMM save/load functionallity in kyra1.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.cpp
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-01-21 15:23:30 UTC (rev 35979)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-01-21 15:36:31 UTC (rev 35980)
@@ -476,7 +476,9 @@
 			updateMousePointer();
 		}
 
+		_isSaveAllowed = isMainLoop;
 		updateInput();
+		_isSaveAllowed = false;
 
 		if (_currentCharacter && _currentCharacter->sceneId == 210 && update)
 			updateKyragemFading();

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-01-21 15:23:30 UTC (rev 35979)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-01-21 15:36:31 UTC (rev 35980)
@@ -226,11 +226,8 @@
 
 int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) {
 	debugC(9, kDebugLevelMain, "KyraEngine_v1::checkInput(%p, %d)", (const void*)buttonList, mainLoop);
-	if (mainLoop)
-		_isSaveAllowed = true;
-
+	_isSaveAllowed = mainLoop;
 	updateInput();
-
 	_isSaveAllowed = false;
 
 	int keys = 0;


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