Merge branch 'jt/runway' into next

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 531308068c8298a0838e6aeb7a91d4b495f39ef4..782a229a88a7498568d031ae670bd5a6192dc489 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -24,7 +24,6 @@
 #  include <config.h>
 #endif
 
-#include <simgear/scene/model/modellib.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -32,11 +31,13 @@
 #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>
-#include <ATC/AIMgr.hxx>
-#include <ATC/ATCmgr.hxx>
+#include <ATCDCL/AIMgr.hxx>
+#include <ATCDCL/ATCmgr.hxx>
 #include <Autopilot/route_mgr.hxx>
 #include <Cockpit/panel.hxx>
 #include <GUI/new_gui.hxx>
@@ -46,6 +47,8 @@
 #include <Navaids/awynet.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
+#include <Navaids/navlist.hxx>
+#include <Navaids/fixlist.hxx>
 
 #include "globals.hxx"
 #include "renderer.hxx"
@@ -70,18 +73,15 @@ 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 ),
     ephem( NULL ),
     mag( NULL ),
+    matlib( NULL ),
     route_mgr( NULL ),
     current_panel( NULL ),
     soundmgr( NULL ),
-    airports( NULL ),
     ATC_mgr( NULL ),
     AI_mgr( NULL ),
     controls( NULL ),
@@ -90,7 +90,6 @@ FGGlobals::FGGlobals() :
     initial_state( NULL ),
     locale( NULL ),
     commands( SGCommandMgr::instance() ),
-    model_lib( NULL ),
     acmodel( NULL ),
     model_mgr( NULL ),
     channel_options_list( NULL ),
@@ -103,10 +102,11 @@ FGGlobals::FGGlobals() :
     loclist( NULL ),
     gslist( NULL ),
     dmelist( NULL ),
-    mkrlist( NULL ),
     tacanlist( NULL ),
-    carrierlist( NULL ), 
-    fixlist( NULL )
+    carrierlist( NULL ),
+    channellist( NULL ),
+    airwaynet( NULL ),
+    multiplayer_mgr( NULL )
 {
 }
 
@@ -122,65 +122,63 @@ FGGlobals::~FGGlobals()
     // shut down all subsystems, make sure we take down the 
     // AIModels system first.
     subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model");
-     delete subsystem_mgr;
-     delete event_mgr;
-     delete time_params;
-     delete ephem;
-     delete mag;
-     delete matlib;
-     delete route_mgr;
-     delete current_panel;
-     delete soundmgr;
-     delete airports;
-
-     delete runways;
-     delete ATC_mgr;
-     delete AI_mgr;
-     delete controls;
-     delete viewmgr;
-
-     delete initial_state;
-//     //delete locale; Don't delete locale
+    delete subsystem_mgr;
+    delete event_mgr;
+    delete time_params;
+    delete ephem;
+    delete mag;
+    delete matlib;
+    delete route_mgr;
+    delete current_panel;
+    delete soundmgr;
+
+    delete ATC_mgr;
+    delete AI_mgr;
+    delete controls;
+    delete viewmgr;
+
 //     delete commands;
-     delete model_lib;
-     delete acmodel;
-     delete model_mgr;
-     delete channel_options_list;
-     delete initial_waypoints;
-     delete scenery;
-     //delete tile_mgr; // Don't delete tile manager yet, because loader thread problems
-     delete io;
-     delete fontcache;
+    delete acmodel;
+    delete model_mgr;
+    delete channel_options_list;
+    delete initial_waypoints;
+    delete tile_mgr;
+    delete scenery;
+    delete io;
+    delete fontcache;
 
     delete navlist;
     delete loclist;
     delete gslist;
     delete dmelist;
-    delete mkrlist;
     delete tacanlist;
     delete carrierlist;
     delete channellist;
-    delete fixlist;
     delete airwaynet;
     delete multiplayer_mgr;
- 
-    delete props;
 }
 
 
 // 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" );
     tmp.append( "version" );
     if ( ulFileExists( tmp.c_str() ) ) {
         fg_root += "/data";
+        SG_LOG(SG_GENERAL, SG_WARN, "Warning: changing bad FG_ROOT/--fg-root to '"
+                << fg_root << '\'');
     }
 
-    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) {
@@ -267,7 +265,6 @@ FGGlobals::get_event_mgr () const
 void
 FGGlobals::saveInitialState ()
 {
-  delete initial_state;
   initial_state = new SGPropertyNode();
 
   if (!copyProperties(props, initial_state))