Avoid a dependency on the environment-manager.

[flightgear.git] / src / Instrumentation / airspeed_indicator.hxx

diff --git a/src/Instrumentation/airspeed_indicator.hxx b/src/Instrumentation/airspeed_indicator.hxx
index 41e544c66704228c89c5da84fef7fb4bdbf08eae..0a35406ae4fd59b4f6a93a91d64d742b4a7012fe 100644 (file)
--- a/src/Instrumentation/airspeed_indicator.hxx
+++ b/src/Instrumentation/airspeed_indicator.hxx
@@ -14,9 +14,6 @@
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
-// forward decls
-class FGEnvironmentMgr;
-
 /**
  * Model an airspeed indicator tied to the pitot and static ports.
  *
@@ -40,17 +37,18 @@ public:
     virtual ~AirspeedIndicator ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void update (double dt);
 
 private:
     void computeMach(double ias);
 
-    string _name;
+    std::string _name;
     unsigned int _num;
-    string _total_pressure;
-    string _static_pressure;
+    std::string _total_pressure;
+    std::string _static_pressure;
     bool _has_overspeed;
-    string _pressure_alt_source;
+    std::string _pressure_alt_source;
     double _ias_limit;
     double _mach_limit;
     double _alt_threshold;
@@ -67,8 +65,8 @@ private:
     SGPropertyNode_ptr _pressure_alt;
     SGPropertyNode_ptr _mach_node;
     SGPropertyNode_ptr _tas_node;
-    
-    FGEnvironmentMgr* _environmentManager;
+    SGPropertyNode_ptr _sea_level_pressure_node;
+    SGPropertyNode_ptr _oat_celsius_node;
 };
 
 #endif // __INSTRUMENTS_AIRSPEED_INDICATOR_HXX