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

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

diff --git a/src/Environment/ridge_lift.hxx b/src/Environment/ridge_lift.hxx
index 999c8e63ea52a889df464ac2ba847ac1008306b4..642683c06141e0bcebf2e7ef818437c24fd1b469 100644 (file)
--- a/src/Environment/ridge_lift.hxx
+++ b/src/Environment/ridge_lift.hxx
@@ -36,6 +36,7 @@
 #include <string>
 using std::string;
 
+#include <simgear/props/tiedpropertylist.hxx>
 
 class FGRidgeLift : public SGSubsystem {
 public:
@@ -56,34 +57,31 @@ public:
        inline double get_slope( int index ) const { return slope[index]; };
 
 private:
-       double dist_probe_m[5];
+       static const double dist_probe_m[5];
 
        double strength;
        double timer;
 
-       double probe_lat_rad[5];
-       double probe_lon_rad[5];
-
        double probe_lat_deg[5];
        double probe_lon_deg[5];
-
        double probe_elev_m[5];
 
        double slope[4];
 
        double lift_factor;
 
+       SGPropertyNode_ptr _enabled_node;
        SGPropertyNode_ptr _ridge_lift_fps_node;
 
        SGPropertyNode_ptr _surface_wind_from_deg_node;
        SGPropertyNode_ptr _surface_wind_speed_node;
 
-       SGPropertyNode_ptr _user_altitude_ft_node;
        SGPropertyNode_ptr _user_altitude_agl_ft_node;
-       SGPropertyNode_ptr _earth_radius_node;
        SGPropertyNode_ptr _user_longitude_node;
        SGPropertyNode_ptr _user_latitude_node;
+       SGPropertyNode_ptr _ground_elev_node;
 
+       simgear::TiedPropertyList _tiedProperties;
 };
 
 #endif  // _FG_RidgeLift_HXX