Rename reInit() method to 'resetSimulator', and document that it's hooked up to the...

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index 2563251d888688a8be64482035a2829e0b02b3b3..4a02d0a5e52c8c55b2ff8dd23894ee9787c705a2 100644 (file)
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -55,7 +55,6 @@ extern fntTexFont *guiFntHandle;
 extern int gui_menu_on;
 
 // from gui_funcs.cxx
-extern void reInit(void);
 extern void fgDumpSnapShotWrapper();
 #ifdef TR_HIRES_SNAP
 extern void fgHiResDumpWrapper();

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 96acc84e3bd1a8590fd7c57393dfe4a824241510..1dd37d387e8912f2e11cc24a4f6643994c1c74e3 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -223,7 +223,7 @@ do_exit (const SGPropertyNode * arg)
 static bool
 do_reset (const SGPropertyNode * arg)
 {
-    reInit();
+    doSimulatorReset();
     return true;
 }
 

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 27cc0866b5cccd034d2f3f480f3b15167d8bf11a..e4bec1548aa46238f0f3f01c15ac43777d768037 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -1652,7 +1652,7 @@ void fgReInitSubsystems()
 }
 
 
-void reInit(void)  // from gui_local.cxx -- TODO merge with fgReInitSubsystems()
+void doSimulatorReset(void)  // from gui_local.cxx -- TODO merge with fgReInitSubsystems()
 {
     static SGPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master", true);
 

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 1fc53a6fffa5e77a57d4d0a53f5f9e7bd68b7320..58b48a8c2e4eb018b2051f58413eec5c4af9c524 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -65,6 +65,11 @@ 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);
 
 // Set the initial position based on presets (or defaults)
 bool fgInitPosition();