projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5bc119
)
Revert "Load audio earlier in the process. Might save us some time"
author
Tobias Markus
<tobbi@mozilla-uk.org>
Thu, 19 Mar 2015 23:45:43 +0000
(
00:45
+0100)
committer
Tobias Markus
<tobbi@mozilla-uk.org>
Thu, 19 Mar 2015 23:45:43 +0000
(
00:45
+0100)
This reverts commit
c0e497c19521c1868f44c0fd21bbf666a66654be
.
src/supertux/main.cpp
patch
|
blob
|
history
diff --git
a/src/supertux/main.cpp
b/src/supertux/main.cpp
index
17571a3
..
1cfba9c
100644
(file)
--- a/
src/supertux/main.cpp
+++ b/
src/supertux/main.cpp
@@
-299,11
+299,6
@@
Main::launch_game()
SDLSubsystem sdl_subsystem;
ConsoleBuffer console_buffer;
SDLSubsystem sdl_subsystem;
ConsoleBuffer console_buffer;
- timelog("audio");
- SoundManager sound_manager;
- sound_manager.enable_sound(g_config->sound_enabled);
- sound_manager.enable_music(g_config->music_enabled);
-
timelog("controller");
InputManager input_manager(g_config->keyboard_config, g_config->joystick_config);
timelog("controller");
InputManager input_manager(g_config->keyboard_config, g_config->joystick_config);
@@
-314,6
+309,11
@@
Main::launch_game()
DrawingContext context(*video_system);
init_video();
DrawingContext context(*video_system);
init_video();
+ timelog("audio");
+ SoundManager sound_manager;
+ sound_manager.enable_sound(g_config->sound_enabled);
+ sound_manager.enable_music(g_config->music_enabled);
+
Console console(console_buffer);
timelog("scripting");
Console console(console_buffer);
timelog("scripting");