diff options
| author | Tarek Soliman | 2011-10-21 10:33:56 -0500 |
|---|---|---|
| committer | Tarek Soliman | 2011-10-27 10:46:22 -0500 |
| commit | ac85d134b31f770f27d085c0fe4c307e278c1875 (patch) | |
| tree | b35c55891e09f1a77187f2e3db394620f1721d76 /base/main.cpp | |
| parent | 913b36ab830dc19fece710a0b1a883d1cc48f3cf (diff) | |
| download | scummvm-rg350-ac85d134b31f770f27d085c0fe4c307e278c1875.tar.gz scummvm-rg350-ac85d134b31f770f27d085c0fe4c307e278c1875.tar.bz2 scummvm-rg350-ac85d134b31f770f27d085c0fe4c307e278c1875.zip | |
KEYMAPPER: Make global keymap that is always active
Keymapper now has a global keymap outside the active keymap stack.
That global keymap is always checked after the active stack has been checked.
Diffstat (limited to 'base/main.cpp')
| -rw-r--r-- | base/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/main.cpp b/base/main.cpp index 61a05154c1..352b5e9b33 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -287,8 +287,7 @@ static void setupKeymapper(OSystem &system) { act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0)); mapper->addGlobalKeymap(globalMap); - - mapper->pushKeymap("global", true); + mapper->setGlobalKeymap(globalMap); #endif } |