[Scummvm-cvs-logs] SF.net SVN: scummvm:[35621] scummvm/trunk/engines/scumm/input.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Dec 30 15:28:47 CET 2008
Revision: 35621
http://scummvm.svn.sourceforge.net/scummvm/?rev=35621&view=rev
Author: lordhoto
Date: 2008-12-30 14:28:44 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
Implemented FR #2475519 "Enable F1 game menu in Full Throttle".
Modified Paths:
--------------
scummvm/trunk/engines/scumm/input.cpp
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp 2008-12-30 10:19:16 UTC (rev 35620)
+++ scummvm/trunk/engines/scumm/input.cpp 2008-12-30 14:28:44 UTC (rev 35621)
@@ -324,19 +324,6 @@
#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_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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list