From 13ff4f72ba9c84a9dcc0eeda71221f166bb1893b Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 30 Dec 2020 23:16:14 +0000 Subject: [PATCH] Always show if train breakdown is due to RV collision --- src/vehicle_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 1852963758..86733a4517 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -3317,7 +3317,8 @@ public: if (v->vehstatus & VS_CRASHED) { str = STR_VEHICLE_STATUS_CRASHED; } else if (v->breakdown_ctr == 1 || (v->type == VEH_TRAIN && Train::From(v)->flags & VRF_IS_BROKEN)) { - if (_settings_game.vehicle.improved_breakdowns) { + const Vehicle *w = (v->type == VEH_TRAIN) ? GetMostSeverelyBrokenEngine(Train::From(v)) : v; + if (_settings_game.vehicle.improved_breakdowns || w->breakdown_type == BREAKDOWN_RV_CRASH) { str = STR_VEHICLE_STATUS_BROKEN_DOWN_VEL; SetDParam(3, v->GetDisplaySpeed()); } else { @@ -3332,7 +3333,6 @@ public: SetDParam(1, v->current_order.GetDestination()); } } else { - const Vehicle *w = (v->type == VEH_TRAIN) ? GetMostSeverelyBrokenEngine(Train::From(v)) : v; SetDParam(0, STR_BREAKDOWN_TYPE_CRITICAL + w->breakdown_type); if (w->breakdown_type == BREAKDOWN_LOW_SPEED) {