[Scummvm-cvs-logs] SF.net SVN: scummvm: [27663] scummvm/trunk/engines/scumm/input.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jun 23 14:31:46 CEST 2007
Revision: 27663
http://scummvm.svn.sourceforge.net/scummvm/?rev=27663&view=rev
Author: fingolfin
Date: 2007-06-23 05:31:42 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Moved F1 key remapping in COMI to a more appropriate place
Modified Paths:
--------------
scummvm/trunk/engines/scumm/input.cpp
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp 2007-06-23 12:24:49 UTC (rev 27662)
+++ scummvm/trunk/engines/scumm/input.cpp 2007-06-23 12:31:42 UTC (rev 27663)
@@ -93,10 +93,6 @@
// FIXME: Handle this specific property inside processKeyboard ?
_keyPressed = event.kbd;
_keyPressed.ascii = event.kbd.keycode + 154;
- } else if (event.kbd.keycode == Common::KEYCODE_F1 && (_game.id == GID_CMI && !(_game.features & GF_DEMO))) {
- // FIXME: support in-game menu screen. For now, this remaps F1 to F5 in COMI
- // FIXME: Handle this specific property inside processKeyboard ?
- _keyPressed = Common::KeyState(Common::KEYCODE_F5, Common::ASCII_F5);
} else if (event.kbd.keycode < Common::KEYCODE_UP || event.kbd.keycode > Common::KEYCODE_LEFT || _game.version >= 7) {
// FIXME: Handle this specific property inside processKeyboard ?
@@ -369,10 +365,17 @@
#ifndef DISABLE_SCUMM_7_8
void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
- // Alt-F5 brings up the original save/load dialog
- if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT && !(_game.features & GF_DEMO)) {
- lastKeyHit = Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1);
+ 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, Common::ASCII_F5);
+ }
+
+ // Alt-F5 brings up the original save/load dialog
+ if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT) {
+ lastKeyHit = Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1);
+ }
}
// If a key script was specified (a V8 feature), and it's trigger
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