aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/input.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 83e9357d5e..d886ec4af3 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -325,6 +325,11 @@ void ScummEngine::processInput() {
#ifdef ENABLE_SCUMM_7_8
void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
+ // 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);
+ }
+
// 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);
@@ -344,11 +349,6 @@ 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);
- // 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
// a version dialog, unless VAR_VERSION_KEY is set to 0. However, the COMI
// version string is hard coded in the engine, hence we don't invoke