Bernie Bright:

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 312dc0b81080983ff34e846d8683e8c397f31880..6d1a7bf340a80f22870f444cdc88fc61798e742c 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -21,9 +21,15 @@
 // $Id$
 
 
+#include <simgear/misc/commands.hxx>
+
+#include <Environment/environment_mgr.hxx>
+
 #include "globals.hxx"
-#include "fg_props.hxx"
+#include "viewmgr.hxx"
 
+#include "fg_props.hxx"
+#include "fg_io.hxx"
 
 \f
 ////////////////////////////////////////////////////////////////////////
@@ -36,11 +42,17 @@ FGGlobals *globals;
 
 // Constructor
 FGGlobals::FGGlobals() :
-    freeze( false ),
+    sim_time_sec(0.0),
+#if defined(FX) && defined(XMESA)
+    fullscreen( true ),
+#endif
     warp( 0 ),
     warp_delta( 0 ),
-    props(0),
-    initial_state(0)
+    logger(0),
+    props(new SGPropertyNode),
+    initial_state(0),
+    commands(new SGCommandMgr),
+    io(new FGIO)
 {
 }
 
@@ -49,6 +61,9 @@ FGGlobals::FGGlobals() :
 FGGlobals::~FGGlobals() 
 {
   delete initial_state;
+  delete props;
+  delete commands;
+  delete io;
 }
 
 
@@ -59,7 +74,7 @@ FGGlobals::saveInitialState ()
   delete initial_state;
   initial_state = new SGPropertyNode();
   if (!copyProperties(props, initial_state))
-    FG_LOG(FG_GENERAL, FG_ALERT, "Error saving initial state");
+    SG_LOG(SG_GENERAL, SG_ALERT, "Error saving initial state");
 }
 
 
@@ -68,14 +83,19 @@ void
 FGGlobals::restoreInitialState ()
 {
   if (initial_state == 0) {
-    FG_LOG(FG_GENERAL, FG_ALERT, "No initial state available to restore!!!");
+    SG_LOG(SG_GENERAL, SG_ALERT, "No initial state available to restore!!!");
   } else if (!copyProperties(initial_state, props)) {
-    FG_LOG(FG_GENERAL, FG_INFO,
+    SG_LOG(SG_GENERAL, SG_INFO,
           "Some errors restoring initial state (probably just read-only props)");
   } else {
-    FG_LOG(FG_GENERAL, FG_INFO, "Initial state restored successfully");
+    SG_LOG(SG_GENERAL, SG_INFO, "Initial state restored successfully");
   }
 }
 
+FGViewer *
+FGGlobals::get_current_view () const
+{
+  return viewmgr->get_current_view();
+}
 
 // end of globals.cxx