From bb46e53667c017442bd456b3da384bbf82ca1347 Mon Sep 17 00:00:00 2001
From: Joseph-Eugene Winzer
Date: Sun, 11 Mar 2018 21:57:17 +0100
Subject: SUPERNOVA: Processes all keyboard queries in processInput()

---
 engines/supernova/state.cpp     | 4 ++++
 engines/supernova/supernova.cpp | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'engines/supernova')

diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index 8356fe32de..e88b4596a8 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -529,6 +529,10 @@ void GameManager::processInput(Common::KeyState &state) {
 				_vm->quitGame();
 		}
 		break;
+	case Common::KEYCODE_d:
+		if (state.flags & Common::KBD_CTRL)
+			_vm->_console->attach();
+		break;
 	default:
 		break;
 	}
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index f8ae784fb0..c9f6abab7a 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -227,14 +227,8 @@ void SupernovaEngine::updateEvents() {
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			_gm->_keyPressed = true;
-			if (event.kbd.keycode == Common::KEYCODE_d &&
-				(event.kbd.flags & Common::KBD_CTRL)) {
-				_console->attach();
-			}
-
 			_gm->processInput(event.kbd);
 			break;
-
 		case Common::EVENT_LBUTTONUP:
 			// fallthrough
 		case Common::EVENT_RBUTTONUP:
@@ -249,7 +243,6 @@ void SupernovaEngine::updateEvents() {
 			if (_gm->_guiEnabled)
 				_gm->processInput();
 			break;
-
 		default:
 			break;
 		}
-- 
cgit v1.2.3