diff options
| author | Yotam Barnoy | 2010-02-21 04:04:13 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2010-02-21 04:04:13 +0000 |
| commit | ef330ed9b4e5d6252134ed137b042593f79d02a9 (patch) | |
| tree | 919c4ae91efca10102936a1833251b48323b8983 /engines/m4 | |
| parent | cebb052e2cfd963b95d7357b7c21dc8c437e058a (diff) | |
| download | scummvm-rg350-ef330ed9b4e5d6252134ed137b042593f79d02a9.tar.gz scummvm-rg350-ef330ed9b4e5d6252134ed137b042593f79d02a9.tar.bz2 scummvm-rg350-ef330ed9b4e5d6252134ed137b042593f79d02a9.zip | |
Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling
svn-id: r48101
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/events.cpp | 2 | ||||
| -rw-r--r-- | engines/m4/mads_views.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/m4/events.cpp b/engines/m4/events.cpp index b0c5e8f85d..0acf0cd6e4 100644 --- a/engines/m4/events.cpp +++ b/engines/m4/events.cpp @@ -73,7 +73,7 @@ M4EventType Events::handleEvents() { if ((_event.kbd.keycode == Common::KEYCODE_LCTRL) || (_event.kbd.keycode == Common::KEYCODE_RCTRL)) _ctrlFlag = true; - else if (_event.kbd.flags == Common::KBD_CTRL) { + else if (_event.kbd.hasFlags(Common::KBD_CTRL)) { if ((_event.kbd.keycode == Common::KEYCODE_d) && _ctrlFlag) { _console->attach(); _console->onFrame(); diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp index d4d3bc53cb..c06a8de513 100644 --- a/engines/m4/mads_views.cpp +++ b/engines/m4/mads_views.cpp @@ -362,7 +362,7 @@ bool MadsInterfaceView::handleKeypress(int32 keycode) { // Capitalise the letter if necessary if (_cheatKeyCtr < CHEAT_SEQUENCE_MAX) { - if ((flags == Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) { + if ((flags & Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) { ++_cheatKeyCtr; if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX) Dialog::display(_vm, 22, cheatingEnabledDesc); |