diff options
| -rw-r--r-- | src/cargotype.cpp | 22 | ||||
| -rw-r--r-- | src/cargotype.h | 1 | ||||
| -rw-r--r-- | src/newgrf.cpp | 8 |
3 files changed, 30 insertions, 1 deletions
diff --git a/src/cargotype.cpp b/src/cargotype.cpp index bf9561dda..a6ea680d8 100644 --- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -78,6 +78,28 @@ void SetupCargoForClimate(LandscapeID l) } /** + * Get the cargo ID of a default cargo, if present. + * @param l Landscape + * @param ct Default cargo type. + * @return ID number if the cargo exists, else #CT_INVALID + */ +CargoID GetDefaultCargoID(LandscapeID l, CargoType ct) +{ + assert(l < lengthof(_default_climate_cargo)); + + if (ct == CT_INVALID) return CT_INVALID; + + assert(ct < lengthof(_default_climate_cargo[0])); + CargoLabel cl = _default_climate_cargo[l][ct]; + /* Bzzt: check if cl is just an index into the cargo table */ + if (cl < lengthof(_default_cargo)) { + cl = _default_cargo[cl].label; + } + + return GetCargoIDByLabel(cl); +} + +/** * Get the cargo ID by cargo label. * @param cl Cargo type to get. * @return ID number if the cargo exists, else #CT_INVALID diff --git a/src/cargotype.h b/src/cargotype.h index 4a295f1ae..e411d5312 100644 --- a/src/cargotype.h +++ b/src/cargotype.h @@ -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; diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 3473cbdc2..dd03e2327 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -8768,6 +8768,12 @@ static void CalculateRefitMasks() EngineInfo *ei = &e->info; bool only_defaultcargo; ///< Set if the vehicle shall carry only the default cargo + /* If the NewGRF did not set any cargo properties, we apply default cargo translation. */ + if (_gted[engine].defaultcargo_grf == nullptr) { + /* Translate cargo_type using the original climate-specific cargo table. */ + ei->cargo_type = GetDefaultCargoID(_settings_game.game_creation.landscape, static_cast<CargoType>(ei->cargo_type)); + } + /* Did the newgrf specify any refitting? If not, use defaults. */ if (_gted[engine].refittability != GRFTempEngineData::UNSET) { CargoTypes mask = 0; @@ -8814,7 +8820,7 @@ static void CalculateRefitMasks() } /* Clear invalid cargoslots (from default vehicles or pre-NewCargo GRFs) */ - if (!HasBit(_cargo_mask, ei->cargo_type)) ei->cargo_type = CT_INVALID; + if (ei->cargo_type != CT_INVALID && !HasBit(_cargo_mask, ei->cargo_type)) ei->cargo_type = CT_INVALID; /* Ensure that the vehicle is either not refittable, or that the default cargo is one of the refittable cargoes. * Note: Vehicles refittable to no cargo are handle differently to vehicle refittable to a single cargo. The latter might have subtypes. */ |