New options setting/clearing helpers.

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

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 256716a8800eda171de5f0c636eb9647d45cbfb3..8b741c26136ca131d833df2238277e95bdffa487 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -26,29 +26,30 @@
 #define _FG_INIT_HXX
 
 #include <string>
+#include <simgear/misc/sg_path.hxx>
 
 // forward decls
 class SGPropertyNode;
-class SGTime;
 class SGPath;
 
-// Read in configuration (files and command line optoins) but only set
-// fg_root
-bool fgInitFGRoot ( int argc, char **argv );
-
-
 // Return the current base package version
-std::string fgBasePackageVersion();
+std::string fgBasePackageVersion(const SGPath& path);
 
+bool fgInitHome();
 
 // Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv );
+int fgInitConfig ( int argc, char **argv, bool reinit );
+
+void fgInitAircraftPaths(bool reinit);
+
+int fgInitAircraft(bool reinit);
 
+// log various settings / configuration state
+void fgOutputSettings();
 
 // Initialize the localization
 SGPropertyNode *fgInitLocale(const char *language);
 
-
 // Init navaids and waypoints
 bool fgInitNav ();
 
@@ -57,36 +58,21 @@ bool fgInitNav ();
 bool fgInitGeneral ();
 
 
-// This is the top level init routine which calls all the other
-// initialization routines.  If you are adding a subsystem to flight
-// gear, its initialization call should located in this routine.
-bool fgInitSubsystems();
-
-
-// Reset
-void fgReInitSubsystems();
-
-/**
- * this is what the 'reset' command (and hence, GUI) is attached too
- * it overlaps with fgReInitSubsystems quite substantially
- */
-void doSimulatorReset(void);
+// Create all the subsystems needed by the sim
+void fgCreateSubsystems(bool duringReset);
 
-// Set the initial position based on presets (or defaults)
-bool fgInitPosition();
+// called after the subsystems have been bound and initialised,
+// to peform final init
+void fgPostInitSubsystems();
 
+// Re-position: when only location is changing, we can do considerably
+// less work than a full re-init.
+void fgStartReposition();
 
-// Listen to /sim/tower/airport-id and set tower view position accordingly
-void fgInitTowerLocationListener();
+void fgStartNewReset();
 
-/*
- * 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);
+// setup the package system including the global root
+void fgInitPackageRoot();
 
 #endif // _FG_INIT_HXX