mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-16 00:12:51 +00:00
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
This commit is contained in:
commit
6ffb9c24c5
@ -914,15 +914,14 @@ void CallVehicleTicks()
|
||||
|
||||
case VEH_TRAIN:
|
||||
if (HasBit(Train::From(v)->flags, VRF_TOO_HEAVY)) {
|
||||
_current_company = v->owner;
|
||||
if (IsLocalCompany()) {
|
||||
if (v->owner == _local_company) {
|
||||
SetDParam(0, v->index);
|
||||
SetDParam(1, STR_ERROR_TRAIN_TOO_HEAVY);
|
||||
AddVehicleNewsItem(STR_ERROR_TRAIN_TOO_HEAVY, NT_ADVICE, v->index);
|
||||
}
|
||||
ClrBit(Train::From(v)->flags, VRF_TOO_HEAVY);
|
||||
}
|
||||
_current_company = OWNER_NONE;
|
||||
}
|
||||
/* FALL THROUGH */
|
||||
case VEH_ROAD:
|
||||
case VEH_AIRCRAFT:
|
||||
case VEH_SHIP: {
|
||||
|
Loading…
Reference in New Issue
Block a user