petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix: Resolve cargo-types of default vehicles via their cargo label.

Browse Source 
Default vehicles now behave as if they had a cargo translation table. This fixes default vehicles carrying seemingly random cargos, if NewGRF industry sets are present.
This behavior is disabled, when a NewGRF touches any of the cargo-type or refitting properties. In that case it's up to the NewGRF to define its own cargo translation table.
This commit is contained in:
frosch
2021-04-30 17:35:32 +02:00
committed by frosch
parent a9ff296c3d
commit 9f8d0b1bee
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cargotype.h
View File

@@ -177,6 +177,7 @@ extern CargoTypes _standard_cargo_mask;
void SetupCargoForClimate(LandscapeID l);
CargoID GetCargoIDByLabel(CargoLabel cl);
CargoID GetCargoIDByBitnum(uint8 bitnum);
CargoID GetDefaultCargoID(LandscapeID l, CargoType ct);
void InitializeSortedCargoSpecs();
extern std::vector<const CargoSpec *> _sorted_cargo_specs;