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

[sev at users.sourceforge.net]

Revision: 26561
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26561&view=rev
Author:   sev
Date:     2007-04-21 14:39:27 -0700 (Sat, 21 Apr 2007)

Log Message:
-----------
Patch #1704575: 'Fix for #1692346: "KQ2: Cannot leave menu"'

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

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-04-21 21:35:30 UTC (rev 26560)
+++ scummvm/trunk/engines/agi/agi.h	2007-04-21 21:39:27 UTC (rev 26561)
@@ -109,7 +109,8 @@
 	GF_AGI256_2 =    (1 << 3),
 	GF_AGIPAL =      (1 << 4),
 	GF_MACGOLDRUSH = (1 << 5),
-	GF_FANMADE =     (1 << 6)
+	GF_FANMADE =     (1 << 6),
+	GF_ESC_MENU =    (1 << 7) 
 };
 
 struct AGIGameDescription;

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-04-21 21:35:30 UTC (rev 26560)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-04-21 21:39:27 UTC (rev 26561)
@@ -513,7 +513,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_ESC_MENU,
 		0x2917,
 	},
 
@@ -529,7 +529,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_ESC_MENU,
 		0x2440,
 	},
 
@@ -545,7 +545,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_ESC_MENU,
 		0x2440,
 	},
 
@@ -561,7 +561,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_ESC_MENU,
 		0x2440,		// XXX: any major differences from 2.411 to 2.440?
 	},
 
@@ -577,7 +577,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V2,
-		0,
+		GF_ESC_MENU,
 		0x2917,
 	},
 

Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp	2007-04-21 21:35:30 UTC (rev 26560)
+++ scummvm/trunk/engines/agi/keyboard.cpp	2007-04-21 21:39:27 UTC (rev 26561)
@@ -102,8 +102,8 @@
 	VtEntry *v = &_game.viewTable[0];
 	int i;
 
-	/* The Black Cauldron needs KEY_ESCAPE to use menus */
-	if (key == 0 /*|| key == KEY_ESCAPE */ )
+	/* AGI 3.149 games need KEY_ESCAPE to use menus */
+	if (key == 0 || (key == KEY_ESCAPE && (getFeatures() & GF_ESC_MENU)) )
 		return false;
 
 	debugC(3, kDebugLevelInput, "key = %04x", key);


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