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 30e3585feef3f9353e20bee5585c507d423ad6db..782a229a88a7498568d031ae670bd5a6192dc489 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -47,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"
@@ -80,8 +82,6 @@ FGGlobals::FGGlobals() :
     route_mgr( NULL ),
     current_panel( NULL ),
     soundmgr( NULL ),
-    airports( NULL ),
-    runways( NULL ),
     ATC_mgr( NULL ),
     AI_mgr( NULL ),
     controls( NULL ),
@@ -102,11 +102,9 @@ FGGlobals::FGGlobals() :
     loclist( NULL ),
     gslist( NULL ),
     dmelist( NULL ),
-    mkrlist( NULL ),
     tacanlist( NULL ),
     carrierlist( NULL ),
     channellist( NULL ),
-    fixlist( NULL ),
     airwaynet( NULL ),
     multiplayer_mgr( NULL )
 {
@@ -133,9 +131,7 @@ FGGlobals::~FGGlobals()
     delete route_mgr;
     delete current_panel;
     delete soundmgr;
-    delete airports;
 
-    delete runways;
     delete ATC_mgr;
     delete AI_mgr;
     delete controls;
@@ -155,11 +151,9 @@ FGGlobals::~FGGlobals()
     delete loclist;
     delete gslist;
     delete dmelist;
-    delete mkrlist;
     delete tacanlist;
     delete carrierlist;
     delete channellist;
-    delete fixlist;
     delete airwaynet;
     delete multiplayer_mgr;
 }
@@ -175,6 +169,8 @@ void FGGlobals::set_fg_root (const string &root) {
     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 << '\'');
     }
 
     // remove /sim/fg-root before writing to prevent hijacking