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

Road vehicles may no longer be stopped on level crossings.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-05-08 21:54:15 +01:00
parent 0acb4fdd2f
commit 0073c4e71e
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vehicle_gui.cpp
View File

@@ -3026,7 +3026,14 @@ public:
SetDParam(0, v->GetDisplaySpeed());
str = STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL;
}
} else { // no train
} else if (v->type == VEH_ROAD) {
if (RoadVehicle::From(v)->IsRoadVehicleStopped()) {
str = STR_VEHICLE_STATUS_STOPPED;
} else {
SetDParam(0, v->GetDisplaySpeed());
str = STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL;
}
} else { // no train/RV
str = STR_VEHICLE_STATUS_STOPPED;
}
} else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) {