Remove hard-coded values wherever possible;

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

diff --git a/src/Environment/ridge_lift.cxx b/src/Environment/ridge_lift.cxx
index 3b675a93ff686f3d4c3eef285018f8fda05fa1da..cac1388aa90dfb6644c5f2aa4df6d959e4f5707f 100644 (file)
--- a/src/Environment/ridge_lift.cxx
+++ b/src/Environment/ridge_lift.cxx
@@ -187,8 +187,8 @@ void FGRidgeLift::update(double dt) {
        //boundaries
        double boundary2_m = 130.0; // in the lift
        if (lift_factor < 0.0) { // in the sink
-               double highest_probe_temp= max ( probe_elev_m[1], probe_elev_m[2] );
-               double highest_probe_downwind_m= max ( highest_probe_temp, probe_elev_m[3] );
+               double highest_probe_temp= std::max ( probe_elev_m[1], probe_elev_m[2] );
+               double highest_probe_downwind_m= std::max ( highest_probe_temp, probe_elev_m[3] );
                boundary2_m = highest_probe_downwind_m - probe_elev_m[0];
        }
 
@@ -199,7 +199,7 @@ void FGRidgeLift::update(double dt) {
                agl_factor = 1.0;
        } else {
                agl_factor = exp(-(2 + probe_elev_m[0] / 2000) * 
-                               (user_altitude_agl_m - boundary2_m) / max(probe_elev_m[0],200.0));
+                     (user_altitude_agl_m - boundary2_m) / std::max(probe_elev_m[0],200.0));
        }
        
        double ground_wind_speed_mps = _surface_wind_speed_node->getDoubleValue() * SG_NM_TO_METER / 3600;