1
0
Fork 0

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

This commit is contained in:
James Turner 2010-07-01 22:50:11 +01:00
parent d279c394d7
commit 18d42ec1af
4 changed files with 7 additions and 3 deletions

View file

@ -55,7 +55,6 @@ extern fntTexFont *guiFntHandle;
extern int gui_menu_on; extern int gui_menu_on;
// from gui_funcs.cxx // from gui_funcs.cxx
extern void reInit(void);
extern void fgDumpSnapShotWrapper(); extern void fgDumpSnapShotWrapper();
#ifdef TR_HIRES_SNAP #ifdef TR_HIRES_SNAP
extern void fgHiResDumpWrapper(); extern void fgHiResDumpWrapper();

View file

@ -223,7 +223,7 @@ do_exit (const SGPropertyNode * arg)
static bool static bool
do_reset (const SGPropertyNode * arg) do_reset (const SGPropertyNode * arg)
{ {
reInit(); doSimulatorReset();
return true; return true;
} }

View file

@ -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); static SGPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master", true);

View file

@ -65,6 +65,11 @@ bool fgInitSubsystems();
// Reset // Reset
void fgReInitSubsystems(); 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) // Set the initial position based on presets (or defaults)
bool fgInitPosition(); bool fgInitPosition();