From 8d1a5da68001bf938115e63cdcd0d56c097cfdb6 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 23 Apr 2007 08:12:43 +0000
Subject: Patch #1705392: "Fix regression with patch #1704914"

svn-id: r26573
---
 engines/agi/keyboard.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/agi')

diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 27453848ec..8eea4c0c96 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -93,10 +93,6 @@ int AgiEngine::doPollKeyboard() {
 	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 @@ int AgiEngine::handleController(int key) {
 	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++) {
-- 
cgit v1.2.3