projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First round of cleanup up the AddonManager a bit
[supertux.git]
/
src
/
supertux
/
gameconfig.cpp
diff --git
a/src/supertux/gameconfig.cpp
b/src/supertux/gameconfig.cpp
index
13408a7
..
eea7955
100644
(file)
--- a/
src/supertux/gameconfig.cpp
+++ b/
src/supertux/gameconfig.cpp
@@
-108,13
+108,13
@@
Config::load()
const lisp::Lisp* keymap_lisp = config_control_lisp->get_lisp("keymap");
if (keymap_lisp)
{
const lisp::Lisp* keymap_lisp = config_control_lisp->get_lisp("keymap");
if (keymap_lisp)
{
- keyboard_config.read(*
config_control
_lisp);
+ keyboard_config.read(*
keymap
_lisp);
}
const lisp::Lisp* joystick_lisp = config_control_lisp->get_lisp("joystick");
if (joystick_lisp)
{
}
const lisp::Lisp* joystick_lisp = config_control_lisp->get_lisp("joystick");
if (joystick_lisp)
{
- joystick_config.read(joystick_lisp);
+ joystick_config.read(
*
joystick_lisp);
}
}
}
}