Added a "Presets" menu.

[flightgear.git] / src / Main / globals.cxx

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 86a3bcb5b545b5e3a8c7c298c438d69e62868de2..b8341e4c755e960e1fc90bfc7123585c6161fe63 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -24,7 +24,6 @@
 #include <simgear/misc/commands.hxx>
 
 #include <Environment/environment_mgr.hxx>
-#include <Systems/system_mgr.hxx>
 
 #include "globals.hxx"
 #include "viewmgr.hxx"
@@ -43,16 +42,16 @@ FGGlobals *globals;
 
 // Constructor
 FGGlobals::FGGlobals() :
+    subsystem_mgr(new FGSubsystemMgr),
     sim_time_sec(0.0),
 #if defined(FX) && defined(XMESA)
     fullscreen( true ),
 #endif
     warp( 0 ),
     warp_delta( 0 ),
-    logger(0),
-    systemmgr(new FGSystemMgr),
     props(new SGPropertyNode),
     initial_state(0),
+    locale(NULL),
     commands(new SGCommandMgr),
     io(new FGIO)
 {
@@ -62,6 +61,7 @@ FGGlobals::FGGlobals() :
 // Destructor
 FGGlobals::~FGGlobals() 
 {
+  delete subsystem_mgr;
   delete initial_state;
   delete props;
   delete commands;
@@ -84,14 +84,34 @@ FGGlobals::saveInitialState ()
 void
 FGGlobals::restoreInitialState ()
 {
-  if (initial_state == 0) {
-    SG_LOG(SG_GENERAL, SG_ALERT, "No initial state available to restore!!!");
-  } else if (!copyProperties(initial_state, props)) {
-    SG_LOG(SG_GENERAL, SG_INFO,
-          "Some errors restoring initial state (probably just read-only props)");
-  } else {
-    SG_LOG(SG_GENERAL, SG_INFO, "Initial state restored successfully");
-  }
+    if ( initial_state == 0 ) {
+        SG_LOG(SG_GENERAL, SG_ALERT,
+               "No initial state available to restore!!!");
+        return;
+    }
+
+    SGPropertyNode *currentPresets = new SGPropertyNode;
+    SGPropertyNode *targetNode = fgGetNode( "/sim/presets" );
+
+    // stash the /sim/presets tree
+    if ( !copyProperties(targetNode, currentPresets) ) {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to save /sim/presets subtree" );
+    }
+    
+    if ( copyProperties(initial_state, props) ) {
+        SG_LOG( SG_GENERAL, SG_INFO, "Initial state restored successfully" );
+    } else {
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Some errors restoring initial state (read-only props?)" );
+    }
+
+    // recover the /sim/presets tree
+    if ( !copyProperties(currentPresets, targetNode) ) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Failed to restore /sim/presets subtree" );
+    }
+
+   delete currentPresets;
 }
 
 FGViewer *