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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Jul 9 14:03:53 CEST 2007


Revision: 27989
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27989&view=rev
Author:   thebluegr
Date:     2007-07-09 05:03:53 -0700 (Mon, 09 Jul 2007)

Log Message:
-----------
Fix for bug #1746661: "KQ3: Lockup when pressing ESC (Amiga version)"

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/keyboard.cpp
    scummvm/trunk/engines/agi/menu.cpp

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-07-09 09:21:25 UTC (rev 27988)
+++ scummvm/trunk/engines/agi/agi.h	2007-07-09 12:03:53 UTC (rev 27989)
@@ -110,7 +110,8 @@
 	GF_AGI256_2 =    (1 << 3),
 	GF_AGIPAL =      (1 << 4),
 	GF_MACGOLDRUSH = (1 << 5),
-	GF_FANMADE =     (1 << 6)
+	GF_FANMADE =     (1 << 6),
+	GF_FORCEMENUS =	 (1 << 7)
 };
 
 enum AgiGameID {

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-07-09 09:21:25 UTC (rev 27988)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-07-09 12:03:53 UTC (rev 27989)
@@ -635,7 +635,7 @@
 		},
 		GID_KQ3,
 		GType_V2,
-		0,
+		GF_FORCEMENUS,
 		0x2440,
 	},
 

Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp	2007-07-09 09:21:25 UTC (rev 27988)
+++ scummvm/trunk/engines/agi/keyboard.cpp	2007-07-09 12:03:53 UTC (rev 27989)
@@ -127,7 +127,7 @@
 	}
 
 	if (key == BUTTON_LEFT) {
-		if (getflag(fMenusWork) && g_mouse.y <= CHAR_LINES) {
+		if ((getflag(fMenusWork) || (getFeatures() & GF_FORCEMENUS)) && g_mouse.y <= CHAR_LINES) {
 			newInputMode(INPUT_MENU);
 			return true;
 		}

Modified: scummvm/trunk/engines/agi/menu.cpp
===================================================================
--- scummvm/trunk/engines/agi/menu.cpp	2007-07-09 09:21:25 UTC (rev 27988)
+++ scummvm/trunk/engines/agi/menu.cpp	2007-07-09 12:03:53 UTC (rev 27989)
@@ -267,7 +267,7 @@
 	static int menuActive = false;
 	static int buttonUsed = 0;
 
-	if (!_vm->getflag(fMenusWork))
+	if (!_vm->getflag(fMenusWork) && !(_vm->getFeatures() & GF_FORCEMENUS))
 		return false;
 
 	if (!menuActive) {


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