Reset: explicit close-window function.

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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index e72e24e11edf6ce7b513ee9b3f04ccf3729a3f7f..1c39233f4fd75d45a79c100ed35742ce7792c14c 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -53,6 +53,7 @@
 
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/model/particles.hxx>
+#include <simgear/scene/tsync/terrasync.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Aircraft/replay.hxx>
@@ -101,6 +102,7 @@
 #include <Instrumentation/HUD/HUD.hxx>
 #include <Cockpit/cockpitDisplayManager.hxx>
 #include <Network/HTTPClient.hxx>
+#include <Network/fgcom.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -367,35 +369,7 @@ static SGPath platformDefaultDataPath()
   return config;
 }
 
-SGPath platformDesktopPath()
-{  
-    /*
-  typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
-  static GetSpecialFolderPath SHGetSpecialFolderPath = NULL;
-
-  // lazy open+resolve of shell32
-  if (!SHGetSpecialFolderPath) {
-    HINSTANCE shellDll = ::LoadLibrary("shell32");
-    SHGetSpecialFolderPath = (GetSpecialFolderPath) GetProcAddress(shellDll, "SHGetSpecialFolderPathA");
-  }
-  
-  if (!SHGetSpecialFolderPath)
-    return SGPath();
-  
-  char path[PATH_MAX];
-  if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, false)) {
-    return SGPath(path);
-  }
-  
-  // failed, bad
-  return SGPath();
-    */
-    // TODO real implementation and move to SGPath
-    return SGPath(fgGetString("/sim/fg-current"));
-}
-#else
-
-#ifdef __APPLE__
+#elif __APPLE__
 #include <CoreServices/CoreServices.h>
 
 static SGPath platformDefaultDataPath()
@@ -422,11 +396,6 @@ static SGPath platformDefaultDataPath()
   return SGPath::home() / ".fgfs";
 }
 #endif
-SGPath platformDesktopPath()
-{
-  return SGPath::desktop();
-}
-#endif
 
 void fgInitHome()
 {
@@ -440,7 +409,7 @@ void fgInitHome()
 }
 
 // Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv )
+int fgInitConfig ( int argc, char **argv )
 {
     SGPath dataPath = globals->get_fg_home();
     
@@ -465,9 +434,10 @@ bool fgInitConfig ( int argc, char **argv )
       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"))
+        
+      // do not load user settings when reset to default is requested, or if
+      // told to explicitly ignore
+      if (options->isOptionSet("restore-defaults") || options->isOptionSet("ignore-autosave"))
       {
           SG_LOG(SG_ALL, SG_ALERT, "Ignoring user settings. Restoring defaults.");
       }
@@ -484,14 +454,12 @@ bool fgInitConfig ( int argc, char **argv )
 
     FindAndCacheAircraft f(globals->get_props());
     if (!f.loadAircraft()) {
-      return false;
+      return flightgear::FG_OPTIONS_ERROR;
     }
 
     // parse options after loading aircraft to ensure any user
     // overrides of defaults are honored.
-    options->processOptions();
-      
-    return true;
+    return options->processOptions();
 }
 
 
@@ -500,7 +468,7 @@ bool fgInitConfig ( int argc, char **argv )
  * Initialize vor/ndb/ils/fix list management and query systems (as
  * well as simple airport db list)
  * This is called multiple times in the case of a cache rebuild,
- * to allow length caching to take place in the background, without
+ * to allow lengthy caching to take place in the background, without
  * blocking the main/UI thread.
  */
 bool
@@ -541,7 +509,7 @@ bool fgInitGeneral() {
         SG_LOG( SG_GENERAL, SG_ALERT,
                 "Cannot continue without a path to the base package "
                 << "being defined." );
-        exit(-1);
+        return false;
     }
     SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
 
@@ -630,9 +598,7 @@ void fgCreateSubsystems() {
     mpath.append( fgGetString("/sim/rendering/materials-file") );
     if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(),
             globals->get_props()) ) {
-        SG_LOG( SG_GENERAL, SG_ALERT,
-                "Error loading materials file " << mpath.str() );
-        exit(-1);
+        throw sg_io_exception("Error loading materials file", mpath);
     }
 
     globals->add_subsystem( "http", new FGHTTPClient );
@@ -774,6 +740,13 @@ void fgCreateSubsystems() {
     globals->add_subsystem("voice", new FGVoiceMgr, SGSubsystemMgr::DISPLAY);
 #endif
 
+#ifdef ENABLE_IAX
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the FGCom subsystem.
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("fgcom", new FGCom);
+#endif
+
     ////////////////////////////////////////////////////////////////////
     // Initialize the lighting subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -878,6 +851,12 @@ void fgReInitSubsystems()
     // main-loop
     flightgear::initPosition();
     
+    simgear::SGTerraSync* terraSync =
+        static_cast<simgear::SGTerraSync*>(globals->get_subsystem("terrasync"));
+    if (terraSync) {
+        terraSync->reposition();
+    }
+    
     // Force reupdating the positions of the ai 3d models. They are used for
     // initializing ground level for the FDM.
     globals->get_subsystem("ai-model")->reinit();
@@ -940,8 +919,9 @@ public:
   {
     fgFindAircraftInDir(path, this, &ShowAircraft::processAircraft);
   
+       simgear::requestConsole(); // ensure console is shown on Windows
+
     std::sort(_aircraft.begin(), _aircraft.end(), ciLessLibC());
-    SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on Windows
     cout << "Available aircraft:" << endl;
     for ( unsigned int i = 0; i < _aircraft.size(); i++ ) {
         cout << _aircraft[i] << endl;