Interim windows build fix

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

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 6341f43520c2e23da627810b5deb816733f73b3d..8b741c26136ca131d833df2238277e95bdffa487 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -30,15 +30,19 @@
 
 // forward decls
 class SGPropertyNode;
+class SGPath;
 
 // Return the current base package version
-std::string fgBasePackageVersion();
+std::string fgBasePackageVersion(const SGPath& path);
 
-void fgInitHome();
+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();
@@ -46,9 +50,6 @@ void fgOutputSettings();
 // Initialize the localization
 SGPropertyNode *fgInitLocale(const char *language);
 
-/// retrieve the user's desktop directory path
-SGPath platformDesktopPath();
-
 // Init navaids and waypoints
 bool fgInitNav ();
 
@@ -58,23 +59,20 @@ 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
 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);
+
+// Re-position: when only location is changing, we can do considerably
+// less work than a full re-init.
+void fgStartReposition();
+
+void fgStartNewReset();
+
+// setup the package system including the global root
+void fgInitPackageRoot();
 
 #endif // _FG_INIT_HXX