aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorMax Horn2009-01-21 02:11:25 +0000
committerMax Horn2009-01-21 02:11:25 +0000
commitb7f7a8c660a0a16addb84101f2b594eb4a0ac6e1 (patch)
tree52a05774b3c78eef93c194a4bfbe16266367b297 /backends/platform
parent99c6943e3d1ff16652e63fe999730ea0dbda2e8f (diff)
downloadscummvm-rg350-b7f7a8c660a0a16addb84101f2b594eb4a0ac6e1.tar.gz
scummvm-rg350-b7f7a8c660a0a16addb84101f2b594eb4a0ac6e1.tar.bz2
scummvm-rg350-b7f7a8c660a0a16addb84101f2b594eb4a0ac6e1.zip
Yet more cleanup
svn-id: r35973
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/sdl/events.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index 7eb86d6c24..c520defdb5 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -539,9 +539,7 @@ void OSystem_SDL::setupKeymapper() {
mapper->registerHardwareKeySet(keySet);
Keymap *globalMap = new Keymap("global");
- Keymap *guiMap = new Keymap("gui");
Action *act;
- Event evt ;
act = new Action(globalMap, "MENU", "Menu", kGenericActionType, kSelectKeyType);
act->addKeyEvent(KeyState(KEYCODE_F5, ASCII_F5, 0));
@@ -556,13 +554,16 @@ void OSystem_SDL::setupKeymapper() {
act->addKeyEvent(KeyState(KEYCODE_PERIOD, '.', 0));
act = new Action(globalMap, "VIRT", "Display keyboard", kVirtualKeyboardActionType);
- act->addKeyEvent(KeyState(KEYCODE_F6, ASCII_F6, 0));
+ act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
act = new Action(globalMap, "REMP", "Remap keys", kKeyRemapActionType);
- act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+ act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
mapper->addGlobalKeymap(globalMap);
+
+ Keymap *guiMap = new Keymap("gui");
+
act = new Action(guiMap, "CLOS", "Close", kGenericActionType, kStartKeyType);
act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0));