[Scummvm-cvs-logs] SF.net SVN: scummvm:[36276] scummvm/branches/branch-0-13-0/engines/agi

[thebluegr at users.sourceforge.net]

Revision: 36276
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36276&view=rev
Author:   thebluegr
Date:     2009-02-11 23:39:19 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
(backport of #36266): Fix for bug #2538123 - "AGI: loading from launcher disables hotkeys"

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/agi/cycle.cpp
    scummvm/branches/branch-0-13-0/engines/agi/menu.cpp

Modified: scummvm/branches/branch-0-13-0/engines/agi/cycle.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/agi/cycle.cpp	2009-02-11 23:25:12 UTC (rev 36275)
+++ scummvm/branches/branch-0-13-0/engines/agi/cycle.cpp	2009-02-11 23:39:19 UTC (rev 36276)
@@ -330,6 +330,8 @@
 	_game.vars[vKey] = 0;
 
 	debugC(2, kDebugLevelMain, "Entering main loop");
+	bool firstLoop = true;
+	
 	do {
 
 		if (!mainCycle())
@@ -346,6 +348,13 @@
 
 			interpretCycle();
 
+			// Check if the user has asked to load a game from the command line
+			// or the launcher
+			if (firstLoop) {
+				checkQuickLoad();
+				firstLoop = false;
+			}
+ 	 	
 			setflag(fEnteredCli, false);
 			setflag(fSaidAcceptedInput, false);
 			_game.vars[vWordNotFound] = 0;

Modified: scummvm/branches/branch-0-13-0/engines/agi/menu.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/agi/menu.cpp	2009-02-11 23:25:12 UTC (rev 36275)
+++ scummvm/branches/branch-0-13-0/engines/agi/menu.cpp	2009-02-11 23:39:19 UTC (rev 36276)
@@ -260,11 +260,6 @@
 			--iter;
 		}
 	}
-
-	// We need to wait till the main menu is submitted by the game scripts
-	// before checking if we can start loading a save game from the command line.
-	// Menu initialization and submital takes place when the game starts only
-	_vm->checkQuickLoad();
 }
 
 bool Menu::keyhandler(int key) {


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