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 /backends/events/default | |
| 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 'backends/events/default')
| -rw-r--r-- | backends/events/default/default-events.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 8b3fe5cdc4..212cb130c1 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -103,7 +103,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { _keyRepeatTime = time + kKeyRepeatInitialDelay; #endif // Global Main Menu - if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == Common::KEYCODE_F5) { + if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_F5) { if (g_engine && !g_engine->isPaused()) { Common::Event menuEvent; menuEvent.type = Common::EVENT_MAINMENU; @@ -135,7 +135,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { } } #ifdef ENABLE_VKEYBD - else if (event.kbd.keycode == Common::KEYCODE_F7 && event.kbd.flags == 0) { + else if (event.kbd.keycode == Common::KEYCODE_F7 && event.kbd.hasFlags(0)) { if (_vk->isDisplaying()) { _vk->close(true); } else { @@ -149,7 +149,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { } #endif #ifdef ENABLE_KEYMAPPER - else if (event.kbd.keycode == Common::KEYCODE_F8 && event.kbd.flags == 0) { + else if (event.kbd.keycode == Common::KEYCODE_F8 && event.kbd.hasFlags(0)) { if (!_remap) { _remap = true; Common::RemapDialog _remapDialog; |