aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorJohannes Schickel2008-12-30 14:41:44 +0000
committerJohannes Schickel2008-12-30 14:41:44 +0000
commitb7178ecbf6dc4099fa1f7ab856281673799b3546 (patch)
tree761dca3cb93f9efbda5ade56f6f7454eafac886f /engines/scumm
parent90835aa82c915700943a70d9246f2fb3a14f77c8 (diff)
downloadscummvm-rg350-b7178ecbf6dc4099fa1f7ab856281673799b3546.tar.gz
scummvm-rg350-b7178ecbf6dc4099fa1f7ab856281673799b3546.tar.bz2
scummvm-rg350-b7178ecbf6dc4099fa1f7ab856281673799b3546.zip
Cleanup.
svn-id: r35622
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/input.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index a3c1dd78fc..13df905f44 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -324,6 +324,11 @@ void ScummEngine::processInput() {
#ifdef ENABLE_SCUMM_7_8
void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
+ // Alt-F5 should bring up the original save/load dialog, so map it to F1.
+ if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT) {
+ lastKeyHit = Common::KeyState(Common::KEYCODE_F1, 315);
+ }
+
// If a key script was specified (a V8 feature), and it's trigger
// key was pressed, run it. Usually used to display the built-in menu.
if (_keyScriptNo && (_keyScriptKey == lastKeyHit.ascii)) {
@@ -338,16 +343,9 @@ void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
void ScummEngine_v7::processKeyboard(Common::KeyState lastKeyHit) {
const bool cutsceneExitKeyEnabled = (VAR_CUTSCENEEXIT_KEY == 0xFF || VAR(VAR_CUTSCENEEXIT_KEY) != 0);
- if (!(_game.features & GF_DEMO)) {
- // F1 (the trigger for the original save/load dialog) is mapped to F5
- if (lastKeyHit.keycode == Common::KEYCODE_F1 && lastKeyHit.flags == 0) {
- lastKeyHit = Common::KeyState(Common::KEYCODE_F5, 319);
- }
-
- // Alt-F5 should bring up the original save/load dialog, so map it to F1.
- if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT) {
- lastKeyHit = Common::KeyState(Common::KEYCODE_F1, 315);
- }
+ // F1 (the trigger for the original save/load dialog) is mapped to F5
+ if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F1 && lastKeyHit.flags == 0) {
+ lastKeyHit = Common::KeyState(Common::KEYCODE_F5, 319);
}
// VAR_VERSION_KEY (usually ctrl-v) is used in COMI, Dig and FT to trigger