diff options
| author | Tarek Soliman | 2012-02-13 23:24:09 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-02-13 23:24:59 -0600 |
| commit | 5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb (patch) | |
| tree | d408ba0cdddaa2f2e8047f2327f03f2515d3c556 /base/main.cpp | |
| parent | ad9fdfd3904a78da10cbd3f8e0c7358b9d5d4d8b (diff) | |
| download | scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.tar.gz scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.tar.bz2 scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.zip | |
KEYMAPPER: Fix Action ctor args in most keymaps
Diffstat (limited to 'base/main.cpp')
| -rw-r--r-- | base/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/main.cpp b/base/main.cpp index f3ff081d28..81f9b91aa7 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -274,16 +274,16 @@ static void setupKeymapper(OSystem &system) { // Now create the global keymap Keymap *primaryGlobalKeymap = new Keymap(kGlobalKeymapName); Action *act; - act = new Action(primaryGlobalKeymap, "MENU", _("Menu"), kGenericActionType, kSelectKeyType); + act = new Action(primaryGlobalKeymap, "MENU", _("Menu"), kMenuActionType); act->addEvent(EVENT_MAINMENU); - act = new Action(primaryGlobalKeymap, "SKCT", _("Skip"), kGenericActionType, kActionKeyType); + act = new Action(primaryGlobalKeymap, "SKCT", _("Skip")); act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0)); - act = new Action(primaryGlobalKeymap, "PAUS", _("Pause"), kGenericActionType, kStartKeyType); + act = new Action(primaryGlobalKeymap, "PAUS", _("Pause")); act->addKeyEvent(KeyState(KEYCODE_SPACE, ' ', 0)); - act = new Action(primaryGlobalKeymap, "SKLI", _("Skip line"), kGenericActionType, kActionKeyType); + act = new Action(primaryGlobalKeymap, "SKLI", _("Skip line")); act->addKeyEvent(KeyState(KEYCODE_PERIOD, '.', 0)); act = new Action(primaryGlobalKeymap, "VIRT", _("Display keyboard"), kVirtualKeyboardActionType); @@ -292,7 +292,7 @@ static void setupKeymapper(OSystem &system) { act = new Action(primaryGlobalKeymap, "REMP", _("Remap keys"), kKeyRemapActionType); act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0)); - act = new Action(primaryGlobalKeymap, "FULS", _("Toggle FullScreen"), kKeyRemapActionType); + act = new Action(primaryGlobalKeymap, "FULS", _("Toggle FullScreen")); act->addKeyEvent(KeyState(KEYCODE_RETURN, ASCII_RETURN, KBD_ALT)); mapper->addGlobalKeymap(primaryGlobalKeymap); |