aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2016-01-29 23:08:27 +0100
committerJohannes Schickel2016-01-29 23:10:36 +0100
commit3b734082c4cd5e3519fe0260eb12e046ef9b3446 (patch)
tree679dc10296f1f407c05d95be1b784d338b998d86 /engines
parent1e73796bd0b17740ca4c35b9a7bd1882f9de6a37 (diff)
downloadscummvm-rg350-3b734082c4cd5e3519fe0260eb12e046ef9b3446.tar.gz
scummvm-rg350-3b734082c4cd5e3519fe0260eb12e046ef9b3446.tar.bz2
scummvm-rg350-3b734082c4cd5e3519fe0260eb12e046ef9b3446.zip
SCUMM: Allow Alt-x to be used to quit SCUMM games.
This includes a TODO to check which SCUMM games actually exhibit this behavior originally. cbd867329e018d7eca12b3a8842e52b8db9f494d added this behavior to our backend code initially.
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/input.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 3ce053f6bc..1234eda3cc 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -130,6 +130,14 @@ void ScummEngine::parseEvent(Common::Event event) {
_debugger->attach();
} else if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_s) {
_res->resourceStats();
+ } else if (event.kbd.hasFlags(Common::KBD_ALT) && event.kbd.keycode == Common::KEYCODE_x) {
+ // TODO: Some SCUMM games quit when Alt-x is pressed. However, not
+ // all of them seem to exhibit this behavior. LordHoto found that
+ // the Loom manual does not mention this hotkey. On the other hand
+ // the Sam&Max manual mentions that Alt-x does so on "most"
+ // platforms. We should really check which games exhibit this
+ // behavior and only use it for them.
+ quitGame();
} else {
// Normal key press, pass on to the game.
_keyPressed = event.kbd;