Removed FGEnvironmentMgr as a special case in globals, initialization,

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 032781539b6beae3f007c3bc072bd92268e03eab..7a0242c5392a307e3c667223d6a2a77411c2fead 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -24,8 +24,6 @@
 #include <simgear/misc/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#include <Environment/environment_mgr.hxx>
-
 #include "globals.hxx"
 #include "viewmgr.hxx"
 
@@ -57,9 +55,8 @@ FGGlobals::FGGlobals() :
     mag( NULL ),
     autopilot( NULL ),
     route( NULL ),
-    soundmgr( NULL ),
     current_panel( NULL ),
-    environment_mgr( NULL ),
+    soundmgr( NULL ),
     ATC_mgr( NULL ),
     ATC_display( NULL ),
     AI_mgr( NULL ),
@@ -69,8 +66,7 @@ FGGlobals::FGGlobals() :
     initial_state( NULL ),
     locale( NULL ),
     commands( new SGCommandMgr ),
-    model_loader( NULL ),
-    texture_loader( NULL ),
+    model_lib( NULL ),
     acmodel( NULL ),
     model_mgr( NULL ),
     channel_options_list( NULL ),