[Scummvm-cvs-logs] SF.net SVN: scummvm:[50072] scummvm/trunk/engines/agi/cycle.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Jun 20 11:51:12 CEST 2010


Revision: 50072
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50072&view=rev
Author:   eriktorbjorn
Date:     2010-06-20 09:51:11 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
Don't go into "menu input mode" unless the game currently allows the menus to
be displayed. I hope this is the correct fix to keep Police Quest 1 from
hanging if you press Escape while reading the newspaper in the briefing room.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/cycle.cpp

Modified: scummvm/trunk/engines/agi/cycle.cpp
===================================================================
--- scummvm/trunk/engines/agi/cycle.cpp	2010-06-20 07:06:22 UTC (rev 50071)
+++ scummvm/trunk/engines/agi/cycle.cpp	2010-06-20 09:51:11 UTC (rev 50072)
@@ -178,6 +178,9 @@
 }
 
 void AgiEngine::newInputMode(InputMode mode) {
+	if (mode == INPUT_MENU && !getflag(fMenusWork) && !(getFeatures() & GF_MENUS))
+		return;
+
 	_oldMode = _game.inputMode;
 	_game.inputMode = mode;
 }


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