Implemented FR #2475519 "Enable F1 game menu in Full Throttle".

svn-id: r35621

1 files changed, 12 insertions, 13 deletions

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 9f9326da72..a3c1dd78fc 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -324,19 +324,6 @@ void ScummEngine::processInput() {
 
 #ifdef ENABLE_SCUMM_7_8
 void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
-
-	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);
-		}
-	}
-
 	// 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)) {
@@ -351,6 +338,18 @@ 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);
+		}
+	}
+
 	// 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