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

[sev at users.sourceforge.net]

Revision: 26573
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26573&view=rev
Author:   sev
Date:     2007-04-23 01:12:43 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
Patch #1705392: "Fix regression with patch #1704914"

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

Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp	2007-04-22 22:42:01 UTC (rev 26572)
+++ scummvm/trunk/engines/agi/keyboard.cpp	2007-04-23 08:12:43 UTC (rev 26573)
@@ -93,10 +93,6 @@
 	if (_gfx->keypress()) {
 		key = _gfx->getKey();
 
-		if ((getFeatures() & GF_MANHUNTER) && (key == KEY_ENTER) &&
-			(_game.inputMode == INPUT_NONE))
-			key = 0x20; // Set Enter key to Space in Manhunter when there's no text input
-
 		debugC(3, kDebugLevelInput, "key %02x pressed", key);
 	}
 
@@ -111,6 +107,10 @@
 	if (key == 0 || (key == KEY_ESCAPE && (getFeatures() & GF_ESC_MENU)) )
 		return false;
 
+	if ((getFeatures() & GF_MANHUNTER) && (key == KEY_ENTER) &&
+		(_game.inputMode == INPUT_NONE))
+		key = 0x20; // Set Enter key to Space in Manhunter when there's no text input
+
 	debugC(3, kDebugLevelInput, "key = %04x", key);
 
 	for (i = 0; i < MAX_DIRS; i++) {


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