aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl/events.cpp
diff options
context:
space:
mode:
authorStephen Kennedy2008-08-08 14:23:59 +0000
committerStephen Kennedy2008-08-08 14:23:59 +0000
commit4eacc09024515dc95e0afbb1ca9a8f610c55a84d (patch)
tree5ba3182cc818e7ff0e3957536f8af48c30e14da2 /backends/platform/sdl/events.cpp
parent2645ca48ad9bc219b43ab88cc5b071952297a992 (diff)
downloadscummvm-rg350-4eacc09024515dc95e0afbb1ca9a8f610c55a84d.tar.gz
scummvm-rg350-4eacc09024515dc95e0afbb1ca9a8f610c55a84d.tar.bz2
scummvm-rg350-4eacc09024515dc95e0afbb1ca9a8f610c55a84d.zip
Keymapper WIP:
* Got rid of default keymaps as they over-complicated the API * Remapping dialog WIP svn-id: r33699
Diffstat (limited to 'backends/platform/sdl/events.cpp')
-rw-r--r--backends/platform/sdl/events.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index 3b2baf6aa0..f7242393b1 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -532,7 +532,7 @@ void OSystem_SDL::setupKeymapper() {
keySet->addHardwareKey(new HardwareKey( 'f', KeyState(KEYCODE_f), "f" ));
mapper->registerHardwareKeySet(keySet);
- Keymap *global = new Keymap();
+ Keymap *global = new Keymap("global");
Action *act;
Event evt;
@@ -551,6 +551,7 @@ void OSystem_SDL::setupKeymapper() {
#undef ADD_KEYDOWN_EVENT
- mapper->setDefaultGlobalKeymap(global);
+ mapper->addGlobalKeymap(global);
+ mapper->pushKeymap("global");
}