header cleanups

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index e028c94171a8bd48e4e6887e47c683ecb5f3f0b9..30e3585feef3f9353e20bee5585c507d423ad6db 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -31,6 +31,8 @@
 #include <simgear/ephemeris/ephemeris.hxx>
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/scene/material/matlib.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/structure/event_mgr.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Airports/runways.hxx>
@@ -69,9 +71,6 @@ FGGlobals::FGGlobals() :
     event_mgr( new SGEventMgr ),
     sim_time_sec( 0.0 ),
     fg_root( "" ),
-#if defined(FX) && defined(XMESA)
-    fullscreen( true ),
-#endif
     warp( 0 ),
     warp_delta( 0 ),
     time_params( NULL ),
@@ -169,7 +168,7 @@ FGGlobals::~FGGlobals()
 // set the fg_root path
 void FGGlobals::set_fg_root (const string &root) {
     fg_root = root;
-    
+
     // append /data to root if it exists
     SGPath tmp( fg_root );
     tmp.append( "data" );
@@ -178,7 +177,12 @@ void FGGlobals::set_fg_root (const string &root) {
         fg_root += "/data";
     }
 
-    fgSetString("/sim/fg-root", fg_root.c_str());   
+    // remove /sim/fg-root before writing to prevent hijacking
+    SGPropertyNode *n = fgGetNode("/sim", true);
+    n->removeChild("fg-root", 0, false);
+    n = n->getChild("fg-root", 0, true);
+    n->setStringValue(fg_root.c_str());
+    n->setAttribute(SGPropertyNode::WRITE, false);
 }
 
 void FGGlobals::set_fg_scenery (const string &scenery) {