From: Tobias Markus Date: Tue, 27 Aug 2013 01:40:46 +0000 (+0200) Subject: Changing the order in which the components are loaded, video first, then audio, less... X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9a10927797ea2b5f9caf16a418f49f8b8a6f29ce;p=supertux.git Changing the order in which the components are loaded, video first, then audio, less 'important' parts deferred => faster showing of supertux window --- diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp index 9f0d8f208..80373b3f8 100644 --- a/src/supertux/main.cpp +++ b/src/supertux/main.cpp @@ -624,32 +624,29 @@ Main::run(int argc, char** argv) if(pre_parse_commandline(argc, argv)) return 0; - Console::instance = new Console(); init_sdl(); - - timelog("controller"); - g_jk_controller = new JoystickKeyboardController(); + Console::instance = new Console(); 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("audio"); - init_audio(); - timelog("video"); DrawingContext context; context_pointer = &context; init_video(); + + timelog("audio"); + init_audio(); + + timelog("tinygettext"); + init_tinygettext(); + + timelog("controller"); + g_jk_controller = new JoystickKeyboardController(); Console::instance->init_graphics(); @@ -658,6 +655,9 @@ Main::run(int argc, char** argv) timelog("resources"); Resources::load_shared(); + + timelog("addons"); + AddonManager::get_instance().load_addons(); timelog(0);