projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbf531a
)
Don't clear the keymap when loading from file so that the default config is preserved
author
Ingo Ruhnke
<grumbel@gmail.com>
Fri, 29 Aug 2014 21:04:10 +0000
(23:04 +0200)
committer
Ingo Ruhnke
<grumbel@gmail.com>
Fri, 29 Aug 2014 21:04:10 +0000
(23:04 +0200)
src/control/keyboard_config.cpp
patch
|
blob
|
history
diff --git
a/src/control/keyboard_config.cpp
b/src/control/keyboard_config.cpp
index
db6114a
..
a8ec960
100644
(file)
--- a/
src/control/keyboard_config.cpp
+++ b/
src/control/keyboard_config.cpp
@@
-54,7
+54,6
@@
KeyboardConfig::read(const lisp::Lisp& keymap_lisp)
keymap_lisp.get("sdl2", config_is_sdl2);
if (config_is_sdl2)
{
- keymap.clear();
keymap_lisp.get("jump-with-up", jump_with_up_kbd);
lisp::ListIterator iter(&keymap_lisp);
while(iter.next())