aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorsluicebox2019-06-04 12:18:17 -0700
committerFilippos Karapetis2019-06-06 07:08:49 +0300
commita2cc90bf9bbf42f4db953c78d02cd0f1189a3868 (patch)
tree6b0a315ff2a4fd90eb203bda10f6a3881f3eebfb /engines/sci
parent8b929a584fac5022bfc6d061685326e68e2a5588 (diff)
downloadscummvm-rg350-a2cc90bf9bbf42f4db953c78d02cd0f1189a3868.tar.gz
scummvm-rg350-a2cc90bf9bbf42f4db953c78d02cd0f1189a3868.tar.bz2
scummvm-rg350-a2cc90bf9bbf42f4db953c78d02cd0f1189a3868.zip
SCI: Fix backend events treated as keyboard events
Prevents backend events such as EVENT_SCREEN_CHANGED from being misinterpreted as SCI keyboard events
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/event.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index ab56311cd6..7828bb5160 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -253,6 +253,11 @@ SciEvent EventManager::getScummVMEvent() {
}
}
+ // Handle keyboard events for the rest of the function
+ if (ev.type != Common::EVENT_KEYDOWN && ev.type != Common::EVENT_KEYUP) {
+ return noEvent;
+ }
+
// Check for Control-Shift-D (debug console)
if (ev.type == Common::EVENT_KEYDOWN && ev.kbd.hasFlags(Common::KBD_CTRL | Common::KBD_SHIFT) && ev.kbd.keycode == Common::KEYCODE_d) {
// Open debug console