Fix for bug #1052660 (FOA: No keyboard shortcuts for dialogs) - moved hack enabling keyboard fights to allow controlling conversations via number keys again

svn-id: r15853

1 files changed, 14 insertions, 0 deletions

diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 9095edf07e..f530c0bb5f 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -297,6 +297,20 @@ void ScummEngine::checkExecVerbs() {
 				}
 			}
 		}
+		
+		if (_gameId == GID_INDY4 && _mouseButStat >= '0' && _mouseButStat <= '9') {
+			// To support keyboard fighting in FOA, we need to remap the number keys.
+			// FOA apparently expects PC scancode values (see script 46 if you want
+			// to know where I got these numbers from).
+			static const int numpad[10] = {
+					'0',
+					335, 336, 337,
+					331, 332, 333,
+					327, 328, 329
+				};
+			_mouseButStat = numpad[_mouseButStat - '0'];
+		}
+		
 		// Generic keyboard input
 		runInputScript(4, _mouseButStat, 1);
 	} else if (_mouseButStat & MBS_MOUSE_MASK) {