projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate JoystickConfig out into a separate class that can be stored in the global...
[supertux.git]
/
src
/
supertux
/
main.cpp
diff --git
a/src/supertux/main.cpp
b/src/supertux/main.cpp
index
03f5b78
..
0e3e32b
100644
(file)
--- a/
src/supertux/main.cpp
+++ b/
src/supertux/main.cpp
@@
-283,7
+283,7
@@
Main::launch_game()
ConsoleBuffer console_buffer;
timelog("controller");
ConsoleBuffer console_buffer;
timelog("controller");
- InputManager input_manager(g_config->keyboard_config);
+ InputManager input_manager(g_config->keyboard_config
, g_config->joystick_config
);
timelog("commandline");
timelog("commandline");