One more Mac helper moved into CocoaHelpers.mm

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

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index f5215bb723691eaeafbd4821fe62e80ed8d3a724..b0399099a43ff94d921632f9f824d72acb1a6696 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -26,23 +26,26 @@
 #define _FG_INIT_HXX
 
 #include <string>
+#include <simgear/misc/sg_path.hxx>
 
 // forward decls
 class SGPropertyNode;
-class SGPath;
 
 // Return the current base package version
 std::string fgBasePackageVersion();
 
+bool fgInitHome();
 
 // Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv );
+int fgInitConfig ( int argc, char **argv, bool reinit );
 
 
+// log various settings / configuration state
+void fgOutputSettings();
+
 // Initialize the localization
 SGPropertyNode *fgInitLocale(const char *language);
 
-
 // Init navaids and waypoints
 bool fgInitNav ();
 
@@ -52,7 +55,7 @@ bool fgInitGeneral ();
 
 
 // Create all the subsystems needed by the sim
-void fgCreateSubsystems();
+void fgCreateSubsystems(bool duringReset);
 
 // called after the subsystems have been bound and initialised,
 // to peform final init
@@ -61,14 +64,8 @@ void fgPostInitSubsystems();
 // Reset: this is what the 'reset' command (and hence, GUI) is attached to
 void fgReInitSubsystems();
 
-/*
- * Search in the current directory, and in on directory deeper
- * for <aircraft>-set.xml configuration files and show the aircaft name
- * and the contents of the<description> tag in a sorted manner.
- *
- * @parampath the directory to search for configuration files
- */
-void fgShowAircraft(const SGPath &path);
+
+void fgStartNewReset();
 
 #endif // _FG_INIT_HXX