Fix indentation and mixed-up white-space/tabs

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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 38f43dc85deca7ea4f2984eaddb63a6bcb9b8ed6..f7c591d397dc3e17d66307259293b54a2bc4cf66 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -99,6 +99,7 @@
 #include <Viewer/viewmgr.hxx>
 #include <Navaids/NavDataCache.hxx>
 #include <Instrumentation/HUD/HUD.hxx>
+#include <Cockpit/cockpitDisplayManager.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -414,25 +415,30 @@ bool fgInitConfig ( int argc, char **argv )
     home->setStringValue(dataPath.c_str());
     home->setAttribute(SGPropertyNode::WRITE, false);
   
-    flightgear::Options::sharedInstance()->init(argc, argv, dataPath);
+    flightgear::Options* options = flightgear::Options::sharedInstance();
+    options->init(argc, argv, dataPath);
+    bool loadDefaults = flightgear::Options::sharedInstance()->shouldLoadDefaultConfig();
+    if (loadDefaults) {
+      // Read global preferences from $FG_ROOT/preferences.xml
+      SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
+      fgLoadProps("preferences.xml", globals->get_props());
+      SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
+
+      // do not load user settings when reset to default is requested
+      if (flightgear::Options::sharedInstance()->isOptionSet("restore-defaults"))
+      {
+          SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
+      }
+      else
+      {
+          globals->loadUserSettings(dataPath);
+      }
+    } else {
+      SG_LOG(SG_GENERAL, SG_INFO, "not reading default configuration files");
+    }// of no-default-config selected
   
-    // Read global preferences from $FG_ROOT/preferences.xml
-    SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
-    fgLoadProps("preferences.xml", globals->get_props());
-    SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
-
-    // do not load user settings when reset to default is requested
-    if (flightgear::Options::sharedInstance()->isOptionSet("restore-defaults"))
-    {
-        SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
-    }
-    else
-    {
-        globals->loadUserSettings(dataPath);
-    }
-
     // Scan user config files and command line for a specified aircraft.
-    flightgear::Options::sharedInstance()->initAircraft();
+    options->initAircraft();
 
     FindAndCacheAircraft f(globals->get_props());
     if (!f.loadAircraft()) {
@@ -441,7 +447,7 @@ bool fgInitConfig ( int argc, char **argv )
 
     // parse options after loading aircraft to ensure any user
     // overrides of defaults are honored.
-    flightgear::Options::sharedInstance()->processOptions();
+    options->processOptions();
       
     return true;
 }
@@ -602,6 +608,7 @@ void fgCreateSubsystems() {
     globals->add_subsystem("systems", new FGSystemMgr, SGSubsystemMgr::FDM);
     globals->add_subsystem("instrumentation", new FGInstrumentMgr, SGSubsystemMgr::FDM);
     globals->add_subsystem("hud", new HUD, SGSubsystemMgr::DISPLAY);
+    globals->add_subsystem("cockpit-displays", new flightgear::CockpitDisplayManager, SGSubsystemMgr::DISPLAY);
   
     ////////////////////////////////////////////////////////////////////
     // Initialize the XML Autopilot subsystem.
@@ -834,6 +841,8 @@ void fgReInitSubsystems()
     globals->get_subsystem("systems")->reinit();
     globals->get_subsystem("instrumentation")->reinit();
 
+    globals->get_subsystem("ATIS")->reinit();
+
 // setup state to end re-init
     fgSetBool("/sim/signals/reinit", false);
     if ( !freeze ) {