projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4344af0
)
Load audio earlier in the process. Might save us some time
author
Tobias Markus
<tobbi.bugs@googlemail.com>
Mon, 16 Mar 2015 23:29:18 +0000
(
00:29
+0100)
committer
Tobias Markus
<tobbi.bugs@googlemail.com>
Mon, 16 Mar 2015 23:29:18 +0000
(
00:29
+0100)
src/supertux/main.cpp
patch
|
blob
|
history
diff --git
a/src/supertux/main.cpp
b/src/supertux/main.cpp
index
1cfba9c
..
17571a3
100644
(file)
--- a/
src/supertux/main.cpp
+++ b/
src/supertux/main.cpp
@@
-299,6
+299,11
@@
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);
@@
-309,11
+314,6
@@
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");