dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always show if train breakdown is due to RV collision

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-12-30 23:16:14 +00:00
parent 6c82ac2647
commit 13ff4f72ba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicle_gui.cpp
View File

@@ -3317,7 +3317,8 @@ public:
if (v->vehstatus & VS_CRASHED) { if (v->vehstatus & VS_CRASHED) {
str = STR_VEHICLE_STATUS_CRASHED; str = STR_VEHICLE_STATUS_CRASHED;
} else if (v->breakdown_ctr == 1 || (v->type == VEH_TRAIN && Train::From(v)->flags & VRF_IS_BROKEN)) { } 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; str = STR_VEHICLE_STATUS_BROKEN_DOWN_VEL;
SetDParam(3, v->GetDisplaySpeed()); SetDParam(3, v->GetDisplaySpeed());
} else { } else {
@@ -3332,7 +3333,6 @@ public:
SetDParam(1, v->current_order.GetDestination()); SetDParam(1, v->current_order.GetDestination());
} }
} else { } else {
const Vehicle *w = (v->type == VEH_TRAIN) ? GetMostSeverelyBrokenEngine(Train::From(v)) : v;
SetDParam(0, STR_BREAKDOWN_TYPE_CRITICAL + w->breakdown_type); SetDParam(0, STR_BREAKDOWN_TYPE_CRITICAL + w->breakdown_type);
if (w->breakdown_type == BREAKDOWN_LOW_SPEED) { if (w->breakdown_type == BREAKDOWN_LOW_SPEED) {