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

Fix #12302: Allow empty train engines to use an invalid cargo type. (#12325)

Browse Source 
The cargo type will be forced to the first available type (usually passengers) instead of the engine being disabled.

(cherry picked from commit 88cf99017a)
This commit is contained in:
Peter Nelson
2024-03-17 16:23:14 +00:00
committed by Jonathan G Rennison
parent 29496772a1
commit a1b7ca979b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf.cpp
View File

@@ -10821,7 +10821,15 @@ static void CalculateRefitMasks()
ei->cargo_type = (CargoID)FindFirstBit(ei->refit_mask);
}
}
if (ei->cargo_type == INVALID_CARGO) ei->climates = 0;
if (!IsValidCargoID(ei->cargo_type) && e->type == VEH_TRAIN && e->u.rail.railveh_type != RAILVEH_WAGON && e->u.rail.capacity == 0) {
/* For train engines which do not carry cargo it does not matter if their cargo type is invalid.
* Fallback to the first available instead, if the cargo type has not been changed (as indicated by
* cargo_label not being CT_INVALID). */
if (GetActiveCargoLabel(ei->cargo_label) != CT_INVALID) {
ei->cargo_type = static_cast<CargoID>(FindFirstBit(_standard_cargo_mask));
}
}
if (!IsValidCargoID(ei->cargo_type)) ei->climates = 0;
/* Clear refit_mask for not refittable ships */
if (e->type == VEH_SHIP && !e->u.ship.old_refittable) {