diff options
author | Tarek Soliman | 2011-11-02 10:16:16 -0500 |
---|---|---|
committer | Tarek Soliman | 2011-11-02 10:16:16 -0500 |
commit | b708d6de79e2893cddf95d72864d4487a483e0c1 (patch) | |
tree | f2a040c28783a3da60f4d2cd1da15d7ee7ab203a /base | |
parent | 6523454db5c115bcaf1bc24380a444dfbdab43e3 (diff) | |
download | scummvm-rg350-b708d6de79e2893cddf95d72864d4487a483e0c1.tar.gz scummvm-rg350-b708d6de79e2893cddf95d72864d4487a483e0c1.tar.bz2 scummvm-rg350-b708d6de79e2893cddf95d72864d4487a483e0c1.zip |
Revert "KEYMAPPER: Make global keymap that is always active"
This reverts commit ac85d134b31f770f27d085c0fe4c307e278c1875.
Diffstat (limited to 'base')
-rw-r--r-- | base/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp index 352b5e9b33..61a05154c1 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -287,7 +287,8 @@ static void setupKeymapper(OSystem &system) { act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0)); mapper->addGlobalKeymap(globalMap); - mapper->setGlobalKeymap(globalMap); + + mapper->pushKeymap("global", true); #endif } |