projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate KeyboardConfig 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
5fc1db1
..
03f5b78
100644
(file)
--- a/
src/supertux/main.cpp
+++ b/
src/supertux/main.cpp
@@
-64,8
+64,8
@@
public:
g_config.reset(new Config);
try {
g_config->load();
g_config.reset(new Config);
try {
g_config->load();
- }
- catch(const std::exception& e)
+ }
+ catch(const std::exception& e)
{
log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
}
{
log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
}
@@
-83,7
+83,7
@@
public:
{
g_config->save();
}
{
g_config->save();
}
- g_config.reset();
+ g_config.reset();
}
};
}
};
@@
-283,7
+283,7
@@
Main::launch_game()
ConsoleBuffer console_buffer;
timelog("controller");
ConsoleBuffer console_buffer;
timelog("controller");
- InputManager input_manager;
+ InputManager input_manager
(g_config->keyboard_config)
;
timelog("commandline");
timelog("commandline");