[Scummvm-cvs-logs] SF.net SVN: scummvm:[40410] scummvm/trunk/engines/scumm/input.cpp

[Kirben at users.sourceforge.net]

Revision: 40410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40410&view=rev
Author:   Kirben
Date:     2009-05-10 09:51:05 +0000 (Sun, 10 May 2009)

Log Message:
-----------
Fix regression that caused F1 to trigger the original load/save menu in COMI.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/input.cpp

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2009-05-10 07:21:35 UTC (rev 40409)
+++ scummvm/trunk/engines/scumm/input.cpp	2009-05-10 09:51:05 UTC (rev 40410)
@@ -325,6 +325,11 @@
 
 #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_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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.