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

Fix 2fd90960: Missing default vehicles and industry acceptance/production. (#12000)

Browse Source 
* Fix 2fd90960: Missing default vehicles and industry acceptance/production.

Some default definitions are used across multiple climate types and relied on climate-independent cargo slot even though they specified a climate-dependent cargo type.

Add MixedCargoType that indirectly allows multiple labels to be specified for these.
This commit is contained in:
Peter Nelson
2024-02-05 23:11:32 +00:00
committed by GitHub
parent b2b4cceb49
commit 5c630e10b7
6 changed files with 85 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine_type.h
View File

@@ -149,7 +149,7 @@ struct EngineInfo {
byte load_amount;
byte climates; ///< Climates supported by the engine.
CargoID cargo_type;
CargoLabel cargo_label;
std::variant<CargoLabel, MixedCargoType> cargo_label;
CargoTypes refit_mask;
byte refit_cost;
byte misc_flags; ///< Miscellaneous flags. @see EngineMiscFlags