Pull Sound-manager out of FGGlobals

[flightgear.git] / src / Environment / environment_mgr.hxx

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index dab6e6169d7c708e9bb6fd94c077764cae6a536b..08e0b7fe233e8d4ea85f8028f7b148145937c9c3 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -24,20 +24,14 @@
 
 #include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/SGMath.hxx>
 #include <simgear/props/tiedpropertylist.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
+#include <cmath>
 
 class FGEnvironment;
-class FGMetarCtrl;
-class FGMetarFetcher;
 class FGClouds;
 class FGPrecipitationMgr;
+class SGSky;
 
 /**
  * Manage environment information.
@@ -54,7 +48,7 @@ public:
   FGEnvironmentMgr ();
   virtual ~FGEnvironmentMgr ();
 
-  virtual void init ();
+  virtual InitStatus incrementalInit ();
   virtual void reinit ();
   virtual void shutdown ();
   virtual void bind ();
@@ -97,11 +91,9 @@ private:
   FGEnvironment * _environment;        // always the same, for now
   FGClouds *fgClouds;
   bool _cloudLayersDirty;
-  SGPropertyNode_ptr _altitude_n;
-  SGPropertyNode_ptr _longitude_n;
-  SGPropertyNode_ptr _latitude_n;
   simgear::TiedPropertyList _tiedProperties;
   SGPropertyChangeListener * _3dCloudsEnableListener;
+  SGSky* _sky;
 };
 
 #endif // _ENVIRONMENT_MGR_HXX