aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2007-06-23 12:31:42 +0000
committerMax Horn2007-06-23 12:31:42 +0000
commit518cedec9d32902bede6e839878fa02d886f1f4c (patch)
tree9b7e3d8b93ccebb95b712379598ff0a5942bfe7f /engines
parent0a21b0c1f15ad1987a63074f25f0460e0e061811 (diff)
downloadscummvm-rg350-518cedec9d32902bede6e839878fa02d886f1f4c.tar.gz
scummvm-rg350-518cedec9d32902bede6e839878fa02d886f1f4c.tar.bz2
scummvm-rg350-518cedec9d32902bede6e839878fa02d886f1f4c.zip
Moved F1 key remapping in COMI to a more appropriate place
svn-id: r27663
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/input.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index b4962bc773..8b5167aa54 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -93,10 +93,6 @@ void ScummEngine::parseEvents() {
// 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 @@ void ScummEngine::processInput() {
#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