Avoid pessimising braking speed when descending slope

When calculating speed using variable braking force
This commit is contained in:
Jonathan G Rennison
2021-03-18 13:59:05 +00:00
parent 843dce94a4
commit 8cf2b827a1

View File

@@ -796,7 +796,7 @@ static int GetRealisticBrakingSpeedForDistance(const TrainDecelerationStats &sta
v_calc -= IntCbrt(-cb2); v_calc -= IntCbrt(-cb2);
} }
int64 v_calc_sq = sqr(v_calc); int64 v_calc_sq = sqr(v_calc);
if (v_calc_sq < speed_sqr) { if (v_calc_sq < speed_sqr && v_calc_sq > slope_speed_sqr) {
return std::max((int)REALISTIC_BRAKING_MIN_SPEED, v_calc); return std::max((int)REALISTIC_BRAKING_MIN_SPEED, v_calc);
} }
} }