Merge branch 'next' of gitorious.org:fg/flightgear into next

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

diff --git a/src/Environment/environment.hxx b/src/Environment/environment.hxx
index 7e3e5b4b2c56fef64dcd06b429ec4348c8fd271a..c270132262f7883c2fd9a20a4c4f458653918084 100644 (file)
--- a/src/Environment/environment.hxx
+++ b/src/Environment/environment.hxx
@@ -72,6 +72,7 @@ public:
   virtual double get_wind_from_down_fps () const;
   virtual double get_thermal_lift_fps () const;
   virtual double get_ridge_lift_fps () const;  
+  virtual double get_local_weather_lift_fps () const;
 
   virtual double get_turbulence_magnitude_norm () const;
   virtual double get_turbulence_rate_hz () const;
@@ -92,6 +93,7 @@ public:
   virtual void set_wind_from_down_fps (double d);
   virtual void set_thermal_lift_fps (double th);
   virtual void set_ridge_lift_fps (double ri);
+  virtual void set_local_weather_lift_fps (double lwl);
 
   virtual void set_turbulence_magnitude_norm (double t);
   virtual void set_turbulence_rate_hz (double t);
@@ -104,11 +106,10 @@ public:
   virtual bool set_live_update(bool live_update);
 
   void _recalc_ne ();
-  void _recalc_alt_temperature ();
   void _recalc_alt_dewpoint ();
-  void _recalc_alt_pressure ();
   void _recalc_density ();
   void _recalc_relative_humidity ();
+  void _recalc_alt_pt ();
 private:
   void _init();
   void _recalc_hdgspd ();
@@ -148,6 +149,7 @@ private:
   double wind_from_down_fps;
   double thermal_lift_fps;
   double ridge_lift_fps;
+  double local_weather_lift_fps;
 
   bool     live_update;