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

[sev at users.sourceforge.net]

Revision: 49746
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49746&view=rev
Author:   sev
Date:     2010-06-15 10:32:44 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
AGI: Fix bug #2825273.

Bug #2825273: "AGI: KQ4: Dwarf sequence". Always allow ESC to work
in KQ4.

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

Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp	2010-06-15 10:32:25 UTC (rev 49745)
+++ scummvm/trunk/engines/agi/keyboard.cpp	2010-06-15 10:32:44 UTC (rev 49746)
@@ -104,10 +104,10 @@
 	VtEntry *v = &_game.viewTable[0];
 	int i;
 
-	// AGI 3.149 games and The Black Cauldron need KEY_ESCAPE to use menus
+	// AGI 3.149 games, The Black Cauldron and King's Quest 4 need KEY_ESCAPE to use menus
 	// Games with the GF_ESCPAUSE flag need KEY_ESCAPE to pause the game
 	if (key == 0 ||
-		(key == KEY_ESCAPE && getVersion() != 0x3149 && getGameID() != GID_BC && !(getFeatures() & GF_ESCPAUSE)) )
+		(key == KEY_ESCAPE && getVersion() != 0x3149 && getGameID() != GID_BC && getGameID() != GID_KQ4 && !(getFeatures() & GF_ESCPAUSE)) )
 		return false;
 
 	if ((getGameID() == GID_MH1 || getGameID() == GID_MH2) && (key == KEY_ENTER) &&


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