diff options
| author | Tarek Soliman | 2012-02-02 18:53:14 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-02-02 19:10:01 -0600 |
| commit | a488556dcdfb69ec30af740aa2c71977f505ef35 (patch) | |
| tree | fa104a21bf019b45b792034cce5939c4eaf8cf9e | |
| parent | 70d94bdd2c469bd8cd52b8d2367c64130b1679f1 (diff) | |
| download | scummvm-rg350-a488556dcdfb69ec30af740aa2c71977f505ef35.tar.gz scummvm-rg350-a488556dcdfb69ec30af740aa2c71977f505ef35.tar.bz2 scummvm-rg350-a488556dcdfb69ec30af740aa2c71977f505ef35.zip | |
KEYMAPPER: Handle EVENT_MAINMENU directly
| -rw-r--r-- | backends/keymapper/keymapper.cpp | 3 | ||||
| -rw-r--r-- | base/main.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 38711343c2..6d9ae21ef8 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -268,6 +268,9 @@ void Keymapper::executeAction(const Action *action, bool keyDown) { case EVENT_MBUTTONUP: if (keyDown) evt.type = EVENT_MBUTTONDOWN; break; + case EVENT_MAINMENU: + if (!keyDown) evt.type = EVENT_MAINMENU; + break; default: // don't deliver other events on key up if (!keyDown) continue; diff --git a/base/main.cpp b/base/main.cpp index b39165ed6a..c6f29bc33e 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -275,7 +275,7 @@ static void setupKeymapper(OSystem &system) { // Now create the global keymap act = new Action(globalMap, "MENU", _("Menu"), kGenericActionType, kSelectKeyType); - act->addKeyEvent(KeyState(KEYCODE_F5, ASCII_F5, 0)); + act->addEvent(EVENT_MAINMENU); act = new Action(globalMap, "SKCT", _("Skip"), kGenericActionType, kActionKeyType); act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0)); |