libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r26561
This commit is contained in:
Eugene Sandulenko 2007-04-21 21:39:27 +00:00
parent 3be109b646
commit 08f5b5f31d
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/agi/agi.h
View File

@ -109,7 +109,8 @@ enum AgiGameFeatures {
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;

10
engines/agi/detection.cpp
View File

@ -513,7 +513,7 @@ static const AGIGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
GType_V2,
0,
GF_ESC_MENU,
0x2917,
},
@ -529,7 +529,7 @@ static const AGIGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
GType_V2,
0,
GF_ESC_MENU,
0x2440,
},
@ -545,7 +545,7 @@ static const AGIGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
GType_V2,
0,
GF_ESC_MENU,
0x2440,
},
@ -561,7 +561,7 @@ static const AGIGameDescription gameDescriptions[] = {
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 @@ static const AGIGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
GType_V2,
0,
GF_ESC_MENU,
0x2917,
},

4
engines/agi/keyboard.cpp
View File

@ -102,8 +102,8 @@ int AgiEngine::handleController(int key) {
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);