projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recompressing newly added files
[supertux.git]
/
src
/
supertux
/
main.cpp
diff --git
a/src/supertux/main.cpp
b/src/supertux/main.cpp
index
d89420f
..
d878c29
100644
(file)
--- a/
src/supertux/main.cpp
+++ b/
src/supertux/main.cpp
@@
-582,8
+582,8
@@
Main::run(int argc, char** argv)
if(pre_parse_commandline(argc, argv))
return 0;
if(pre_parse_commandline(argc, argv))
return 0;
- Console::instance = new Console();
init_sdl();
init_sdl();
+ Console::instance = new Console();
timelog("controller");
g_jk_controller = new JoystickKeyboardController();
timelog("controller");
g_jk_controller = new JoystickKeyboardController();
@@
-591,23
+591,20
@@
Main::run(int argc, char** argv)
timelog("config");
init_config();
timelog("config");
init_config();
- timelog("addons");
- AddonManager::get_instance().load_addons();
-
- timelog("tinygettext");
- init_tinygettext();
-
timelog("commandline");
if(parse_commandline(argc, argv))
return 0;
timelog("commandline");
if(parse_commandline(argc, argv))
return 0;
- timelog("audio");
- init_audio();
-
timelog("video");
DrawingContext context;
context_pointer = &context;
init_video();
timelog("video");
DrawingContext context;
context_pointer = &context;
init_video();
+
+ timelog("audio");
+ init_audio();
+
+ timelog("tinygettext");
+ init_tinygettext();
Console::instance->init_graphics();
Console::instance->init_graphics();
@@
-616,6
+613,9
@@
Main::run(int argc, char** argv)
timelog("resources");
Resources::load_shared();
timelog("resources");
Resources::load_shared();
+
+ timelog("addons");
+ AddonManager::get_instance().load_addons();
timelog(0);
timelog(0);