Merge branch 'next' into durk-atc

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

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index d9c7703197dc96d980138eb8107f3f8a91eca46b..18b1668bc318bc01701a567a2546b4e00d7ab98d 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -25,7 +25,7 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/SGMath.hxx>
-#include "tiedpropertylist.hxx"
+#include <simgear/props/tiedpropertylist.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -94,9 +94,12 @@ private:
 
   FGEnvironment * _environment;        // always the same, for now
   FGClouds *fgClouds;
-  SGPropertyNode_ptr _altitudeNode;
   bool _cloudLayersDirty;
-  TiedPropertyList _tiedProperties;
+  SGPropertyNode_ptr _altitude_n;
+  SGPropertyNode_ptr _longitude_n;
+  SGPropertyNode_ptr _latitude_n;
+  double _positionTimeToLive;
+  simgear::TiedPropertyList _tiedProperties;
 };
 
 #endif // _ENVIRONMENT_MGR_HXX