Interim windows build fix

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index b2372d457e3c3d94fbe114bc74fb81677280fa66..996c05fa9205da94d999dce4a4ba20912af96aa8 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -260,10 +260,10 @@ static void fgIdleFunction ( void ) {
         // Initialize the TG scenery subsystem.
         ////////////////////////////////////////////////////////////////////
         
-        globals->set_scenery( new FGScenery );
+        globals->add_new_subsystem<FGScenery>(SGSubsystemMgr::DISPLAY);
         globals->get_scenery()->init();
         globals->get_scenery()->bind();
-        globals->set_tile_mgr( new FGTileMgr );
+        globals->add_new_subsystem<FGTileMgr>(SGSubsystemMgr::DISPLAY);
         
         fgSplashProgress("creating-subsystems");
     } else if (( idle_state == 7 ) || (idle_state == 2007)) {
@@ -423,7 +423,7 @@ int fgMainInit( int argc, char **argv )
     string_list *col = new string_list;
     globals->set_channel_options_list( col );
 
-    fgValidatePath("", false);  // initialize static variables
+    fgValidatePath(globals->get_fg_home(), false);  // initialize static variables
     upper_case_property("/sim/presets/airport-id");
     upper_case_property("/sim/presets/runway");
     upper_case_property("/sim/tower/airport-id");
@@ -449,8 +449,8 @@ int fgMainInit( int argc, char **argv )
     showLauncher |= (::getenv("FG_LAUNCHER") != 0);
 
     if (showLauncher) {
-        QtLauncher::initApp(argc, argv);
-        if (!QtLauncher::runLauncherDialog()) {
+        flightgear::initApp(argc, argv);
+        if (!flightgear::runLauncherDialog()) {
             return EXIT_SUCCESS;
         }
     }