projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Load audio earlier in the process. Might save us some time"
[supertux.git]
/
src
/
supertux
/
main.cpp
diff --git
a/src/supertux/main.cpp
b/src/supertux/main.cpp
index
d04eb5f
..
1cfba9c
100644
(file)
--- a/
src/supertux/main.cpp
+++ b/
src/supertux/main.cpp
@@
-306,8
+306,7
@@
Main::launch_game()
timelog("video");
std::unique_ptr<VideoSystem> video_system = VideoSystem::create(g_config->video);
timelog("video");
std::unique_ptr<VideoSystem> video_system = VideoSystem::create(g_config->video);
- DrawingContext context(video_system->get_renderer(),
- video_system->get_lightmap());
+ DrawingContext context(*video_system);
init_video();
timelog("audio");
init_video();
timelog("audio");
@@
-326,7
+325,7
@@
Main::launch_game()
Resources resources;
timelog("addons");
Resources resources;
timelog("addons");
- AddonManager addon_manager("addons", g_config->
disabled_addon_filename
s);
+ AddonManager addon_manager("addons", g_config->
addon
s);
timelog(0);
timelog(0);