diff options
| author | D G Turner | 2014-04-27 04:17:36 +0100 |
|---|---|---|
| committer | D G Turner | 2014-04-27 04:18:47 +0100 |
| commit | b7192731b9e65292fd2998162db63a4e3d76b8dd (patch) | |
| tree | 8a4a9919944e6f464bef9a3b3eb5324ab2e202f1 | |
| parent | 8cf41943f66113c9efbadc4baf17b9a72dce7323 (diff) | |
| download | scummvm-rg350-b7192731b9e65292fd2998162db63a4e3d76b8dd.tar.gz scummvm-rg350-b7192731b9e65292fd2998162db63a4e3d76b8dd.tar.bz2 scummvm-rg350-b7192731b9e65292fd2998162db63a4e3d76b8dd.zip | |
KEYMAPPER: Change hotkey from F8 to CTRL-F8 to reduce game conflicts.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | common/EventMapper.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1269,7 +1269,7 @@ other games. Alt-Enter - Toggles full screen/windowed Alt-s - Make a screenshot (SDL backend only) Ctrl-F7 - Open virtual keyboard (if enabled) - F8 - Open key remapper dialog (if enabled) + Ctrl-F8 - Open key remapper dialog (if enabled) SCUMM: Ctrl 0-9 and Alt 0-9 - Load and save game state diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp index 6a3a7e5be6..b92116cbe7 100644 --- a/common/EventMapper.cpp +++ b/common/EventMapper.cpp @@ -65,10 +65,10 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) { } #endif #ifdef ENABLE_KEYMAPPER - else if (ev.kbd.keycode == KEYCODE_F8 && ev.kbd.hasFlags(0)) { + else if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F8) { mappedEvent.type = EVENT_KEYMAPPER_REMAP; - // Avoid blocking F8 events from engine. + // Avoid blocking CTRL-F8 events from engine. addDelayedEvent(100, ev); } #endif |