From 17089becd410e4e1b95e64c9d0207ffc3eac5801 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 6 Aug 2017 11:23:12 -0400
Subject: TITANIC: Fix handling of NumPad causing double digits

---
 engines/titanic/input_translator.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines/titanic/input_translator.cpp')

diff --git a/engines/titanic/input_translator.cpp b/engines/titanic/input_translator.cpp
index bd805258d5..c5640a48bc 100644
--- a/engines/titanic/input_translator.cpp
+++ b/engines/titanic/input_translator.cpp
@@ -86,13 +86,15 @@ void CInputTranslator::mouseWheel(bool wheelUp, const Point &pt) {
 }
 
 void CInputTranslator::keyDown(const Common::KeyState &keyState) {
-	if (isSpecialKey(keyState.keycode)) {
-		CVirtualKeyCharMsg msg(keyState);
-		_inputHandler->handleMessage(msg);
-	}
-
 	if (keyState.ascii > 0 && keyState.ascii <= 127) {
 		CKeyCharMsg msg(keyState.ascii);
+		if (_inputHandler->handleMessage(msg))
+			return;
+	}
+
+	if (isSpecialKey(keyState.keycode)) {
+		CVirtualKeyCharMsg msg(keyState);
+		msg._keyState.ascii = 0;
 		_inputHandler->handleMessage(msg);
 	}
 }
-- 
cgit v1.2.3