mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-17 21:25:40 +00:00
Fix: Don't show train waiting for unbunching as waiting for free path (#12515)
This commit is contained in:
parent
5878d09ef2
commit
a02da5476e
@ -3118,12 +3118,12 @@ public:
|
|||||||
} else { // no train
|
} else { // no train
|
||||||
str = STR_VEHICLE_STATUS_STOPPED;
|
str = STR_VEHICLE_STATUS_STOPPED;
|
||||||
}
|
}
|
||||||
|
} else if (v->IsInDepot() && v->IsWaitingForUnbunching()) {
|
||||||
|
str = STR_VEHICLE_STATUS_WAITING_UNBUNCHING;
|
||||||
} else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) {
|
} else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) {
|
||||||
str = STR_VEHICLE_STATUS_TRAIN_STUCK;
|
str = STR_VEHICLE_STATUS_TRAIN_STUCK;
|
||||||
} else if (v->type == VEH_AIRCRAFT && HasBit(Aircraft::From(v)->flags, VAF_DEST_TOO_FAR) && !v->current_order.IsType(OT_LOADING)) {
|
} else if (v->type == VEH_AIRCRAFT && HasBit(Aircraft::From(v)->flags, VAF_DEST_TOO_FAR) && !v->current_order.IsType(OT_LOADING)) {
|
||||||
str = STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR;
|
str = STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR;
|
||||||
} else if (v->IsInDepot() && v->IsWaitingForUnbunching()) {
|
|
||||||
str = STR_VEHICLE_STATUS_WAITING_UNBUNCHING;
|
|
||||||
} else { // vehicle is in a "normal" state, show current order
|
} else { // vehicle is in a "normal" state, show current order
|
||||||
if (mouse_over_start_stop) {
|
if (mouse_over_start_stop) {
|
||||||
if (v->vehstatus & VS_STOPPED) {
|
if (v->vehstatus & VS_STOPPED) {
|
||||||
|
Loading…
Reference in New Issue
Block a user