From 60d5bbc0e7767e48ea7fd73d6fa0db642700eb31 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 5 Jun 2016 22:28:17 +0100 Subject: [PATCH] Fix improved breakdowns aircraft speed-reductions. Breakdown speed was wrong and possibly 0 for planes with GRF-defined speed limits. --- src/vehicle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 854ccd6458..353f7c45a1 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1205,8 +1205,8 @@ void DetermineBreakdownType(Vehicle *v, uint32 r) { if (rand <= breakdown_type_chance[BREAKDOWN_AIRCRAFT_SPEED]) { v->breakdown_type = BREAKDOWN_AIRCRAFT_SPEED; /* all speed values here are 1/8th of the real max speed in km/h */ - byte max_speed = min(AircraftVehInfo( v->engine_type )->max_speed >> 3, 255); - byte min_speed = min(15 + (max_speed >> 2), AircraftVehInfo(v->engine_type)->max_speed >> 4); + byte max_speed = max(1, min(v->vcache.cached_max_speed >> 3, 255)); + byte min_speed = max(1, min(15 + (max_speed >> 2), v->vcache.cached_max_speed >> 4)); v->breakdown_severity = min_speed + (((v->reliability + GB(r, 16, 16)) * (max_speed - min_speed)) >> 17); } else if (rand <= breakdown_type_chance[BREAKDOWN_AIRCRAFT_DEPOT]) { v->breakdown_type = BREAKDOWN_AIRCRAFT_DEPOT;