diff options
| author | David Corrales | 2007-08-05 19:34:20 +0000 |
|---|---|---|
| committer | David Corrales | 2007-08-05 19:34:20 +0000 |
| commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
| tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/agi/menu.cpp | |
| parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
| parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
| download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip | |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/agi/menu.cpp')
| -rw-r--r-- | engines/agi/menu.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp index 5edaaf0ded..7aa7f5e55d 100644 --- a/engines/agi/menu.cpp +++ b/engines/agi/menu.cpp @@ -267,7 +267,7 @@ bool Menu::keyhandler(int key) { static int menuActive = false; static int buttonUsed = 0; - if (!_vm->getflag(fMenusWork)) + if (!_vm->getflag(fMenusWork) && !(_vm->getFeatures() & GF_MENUS)) return false; if (!menuActive) { @@ -351,6 +351,12 @@ bool Menu::keyhandler(int key) { debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event); _vm->_game.evKeyp[d->event].occured = true; _vm->_game.evKeyp[d->event].data = d->event; + // In LSL1, event 0x20 is set when changing the game speed to normal via the menu + // Do not set the event data to 0x20, as this event is then incorrectly triggered + // when the spacebar is pressed, which has a keycode equal to 0x20 as well + // Fixes bug #1751390 - "LSL: after changing game speed, space key turn unfunctional" + if (d->event == 0x20) + _vm->_game.evKeyp[d->event].data = d->event + 1; goto exit_menu; } } |