refacto: RenderingEngine::get_scene_manager() is now not callable from singleton

[dragonfireclient.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index f7238176b1e858905cedd0cdc036e140ea217470..7f96836b585cf5d4bfaedb354c6947b106f3b545 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -225,8 +225,7 @@ int main(int argc, char *argv[])
                return run_dedicated_server(game_params, cmd_args) ? 0 : 1;
 
 #ifndef SERVER
-       ClientLauncher launcher;
-       retval = launcher.run(game_params, cmd_args) ? 0 : 1;
+       retval = ClientLauncher().run(game_params, cmd_args) ? 0 : 1;
 #else
        retval = 0;
 #endif
@@ -487,12 +486,15 @@ static bool create_userdata_path()
 static bool init_common(const Settings &cmd_args, int argc, char *argv[])
 {
        startup_message();
-       set_default_settings(g_settings);
+       set_default_settings();
 
        // Initialize sockets
        sockets_init();
        atexit(sockets_cleanup);
 
+       // Initialize g_settings
+       Settings::createLayer(SL_GLOBAL);
+
        if (!read_config_file(cmd_args))
                return false;