mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: rename CargoID to CargoType and amend related variables/comments

pull/13377/head
Rubidium 2025-01-22 18:08:59 +01:00 committed by rubidium42
parent d05cc2ef92
commit e894a5880c
129 changed files with 1009 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aircraft_cmd.cpp
View File

@ -309,10 +309,10 @@ CommandCost CmdBuildAircraft(DoCommandFlag flags, TileIndex tile, const Engine *
u->refit_cap = 0; u->refit_cap = 0;
v->cargo_type = e->GetDefaultCargoType(); v->cargo_type = e->GetDefaultCargoType();
assert(IsValidCargoID(v->cargo_type)); assert(IsValidCargoType(v->cargo_type));
CargoID mail = GetCargoIDByLabel(CT_MAIL); CargoType mail = GetCargoTypeByLabel(CT_MAIL);
if (IsValidCargoID(mail)) { if (IsValidCargoType(mail)) {
u->cargo_type = mail; u->cargo_type = mail;
u->cargo_cap = avi->mail_capacity; u->cargo_cap = avi->mail_capacity;
} }

38
src/articulated_vehicles.cpp
View File

@ -103,18 +103,18 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window)
* @param engine the EngineID of interest * @param engine the EngineID of interest
* @return cargo and capacity * @return cargo and capacity
*/ */
static inline std::pair<CargoID, uint16_t> GetVehicleDefaultCapacity(EngineID engine) static inline std::pair<CargoType, uint16_t> GetVehicleDefaultCapacity(EngineID engine)
{ {
const Engine *e = Engine::Get(engine); const Engine *e = Engine::Get(engine);
CargoID cargo = e->CanCarryCargo() ? e->GetDefaultCargoType() : INVALID_CARGO; CargoType cargo = e->CanCarryCargo() ? e->GetDefaultCargoType() : INVALID_CARGO;
return {cargo, IsValidCargoID(cargo) ? e->GetDisplayDefaultCapacity() : 0}; return {cargo, IsValidCargoType(cargo) ? e->GetDisplayDefaultCapacity() : 0};
} }
/** /**
* Returns all cargoes a vehicle can carry. * Returns all cargoes a vehicle can carry.
* @param engine the EngineID of interest * @param engine the EngineID of interest
* @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask * @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask
* @return bit set of CargoIDs * @return bit set of CargoTypes
*/ */
static inline CargoTypes GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type) static inline CargoTypes GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type)
{ {
@ -140,7 +140,7 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
CargoArray capacity{}; CargoArray capacity{};
const Engine *e = Engine::Get(engine); const Engine *e = Engine::Get(engine);
if (auto [cargo, cap] = GetVehicleDefaultCapacity(engine); IsValidCargoID(cargo)) { if (auto [cargo, cap] = GetVehicleDefaultCapacity(engine); IsValidCargoType(cargo)) {
capacity[cargo] = cap; capacity[cargo] = cap;
} }
@ -152,7 +152,7 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
EngineID artic_engine = GetNextArticulatedPart(i, engine); EngineID artic_engine = GetNextArticulatedPart(i, engine);
if (artic_engine == INVALID_ENGINE) break; if (artic_engine == INVALID_ENGINE) break;
if (auto [cargo, cap] = GetVehicleDefaultCapacity(artic_engine); IsValidCargoID(cargo)) { if (auto [cargo, cap] = GetVehicleDefaultCapacity(artic_engine); IsValidCargoType(cargo)) {
capacity[cargo] += cap; capacity[cargo] += cap;
} }
} }
@ -170,7 +170,7 @@ CargoTypes GetCargoTypesOfArticulatedParts(EngineID engine)
CargoTypes cargoes = 0; CargoTypes cargoes = 0;
const Engine *e = Engine::Get(engine); const Engine *e = Engine::Get(engine);
if (auto [cargo, cap] = GetVehicleDefaultCapacity(engine); IsValidCargoID(cargo) && cap > 0) { if (auto [cargo, cap] = GetVehicleDefaultCapacity(engine); IsValidCargoType(cargo) && cap > 0) {
SetBit(cargoes, cargo); SetBit(cargoes, cargo);
} }
@ -182,7 +182,7 @@ CargoTypes GetCargoTypesOfArticulatedParts(EngineID engine)
EngineID artic_engine = GetNextArticulatedPart(i, engine); EngineID artic_engine = GetNextArticulatedPart(i, engine);
if (artic_engine == INVALID_ENGINE) break; if (artic_engine == INVALID_ENGINE) break;
if (auto [cargo, cap] = GetVehicleDefaultCapacity(artic_engine); IsValidCargoID(cargo) && cap > 0) { if (auto [cargo, cap] = GetVehicleDefaultCapacity(artic_engine); IsValidCargoType(cargo) && cap > 0) {
SetBit(cargoes, cargo); SetBit(cargoes, cargo);
} }
} }
@ -218,8 +218,8 @@ bool IsArticulatedVehicleRefittable(EngineID engine)
* Merges the refit_masks of all articulated parts. * Merges the refit_masks of all articulated parts.
* @param engine the first part * @param engine the first part
* @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask * @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask
* @param union_mask returns bit mask of CargoIDs which are a refit option for at least one articulated part * @param union_mask returns bit mask of CargoTypes which are a refit option for at least one articulated part
* @param intersection_mask returns bit mask of CargoIDs which are a refit option for every articulated part (with default capacity > 0) * @param intersection_mask returns bit mask of CargoTypes which are a refit option for every articulated part (with default capacity > 0)
*/ */
void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, CargoTypes *union_mask, CargoTypes *intersection_mask) void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, CargoTypes *union_mask, CargoTypes *intersection_mask)
{ {
@ -245,7 +245,7 @@ void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type,
* Ors the refit_masks of all articulated parts. * Ors the refit_masks of all articulated parts.
* @param engine the first part * @param engine the first part
* @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask * @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask
* @return bit mask of CargoIDs which are a refit option for at least one articulated part * @return bit mask of CargoTypes which are a refit option for at least one articulated part
*/ */
CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type) CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type)
{ {
@ -258,18 +258,18 @@ CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial
* Get cargo mask of all cargoes carried by an articulated vehicle. * Get cargo mask of all cargoes carried by an articulated vehicle.
* Note: Vehicles not carrying anything are ignored * Note: Vehicles not carrying anything are ignored
* @param v the first vehicle in the chain * @param v the first vehicle in the chain
* @param cargo_type returns the common CargoID if needed. (INVALID_CARGO if no part is carrying something or they are carrying different things) * @param cargo_type returns the common CargoType if needed. (INVALID_CARGO if no part is carrying something or they are carrying different things)
* @return cargo mask, may be 0 if the no vehicle parts have cargo capacity * @return cargo mask, may be 0 if the no vehicle parts have cargo capacity
*/ */
CargoTypes GetCargoTypesOfArticulatedVehicle(const Vehicle *v, CargoID *cargo_type) CargoTypes GetCargoTypesOfArticulatedVehicle(const Vehicle *v, CargoType *cargo_type)
{ {
CargoTypes cargoes = 0; CargoTypes cargoes = 0;
CargoID first_cargo = INVALID_CARGO; CargoType first_cargo = INVALID_CARGO;
do { do {
if (IsValidCargoID(v->cargo_type) && v->GetEngine()->CanCarryCargo()) { if (IsValidCargoType(v->cargo_type) && v->GetEngine()->CanCarryCargo()) {
SetBit(cargoes, v->cargo_type); SetBit(cargoes, v->cargo_type);
if (!IsValidCargoID(first_cargo)) first_cargo = v->cargo_type; if (!IsValidCargoType(first_cargo)) first_cargo = v->cargo_type;
if (first_cargo != v->cargo_type) { if (first_cargo != v->cargo_type) {
if (cargo_type != nullptr) { if (cargo_type != nullptr) {
*cargo_type = INVALID_CARGO; *cargo_type = INVALID_CARGO;
@ -318,8 +318,8 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v)
/* Check whether the vehicle carries more cargoes than expected */ /* Check whether the vehicle carries more cargoes than expected */
bool carries_more = false; bool carries_more = false;
for (CargoID cid : SetCargoBitIterator(real_default_cargoes)) { for (CargoType cargo_type : SetCargoBitIterator(real_default_cargoes)) {
if (purchase_default_capacity[cid] == 0) { if (purchase_default_capacity[cargo_type] == 0) {
carries_more = true; carries_more = true;
break; break;
} }
@ -397,7 +397,7 @@ void AddArticulatedParts(Vehicle *first)
rv->spritenum = e_artic->u.road.image_index; rv->spritenum = e_artic->u.road.image_index;
if (e_artic->CanCarryCargo()) { if (e_artic->CanCarryCargo()) {
rv->cargo_type = e_artic->GetDefaultCargoType(); rv->cargo_type = e_artic->GetDefaultCargoType();
assert(IsValidCargoID(rv->cargo_type)); assert(IsValidCargoType(rv->cargo_type));
rv->cargo_cap = e_artic->u.road.capacity; // Callback 36 is called when the consist is finished rv->cargo_cap = e_artic->u.road.capacity; // Callback 36 is called when the consist is finished
} else { } else {
rv->cargo_type = front->cargo_type; // Needed for livery selection rv->cargo_type = front->cargo_type; // Needed for livery selection

2
src/articulated_vehicles.h
View File

@ -19,7 +19,7 @@ CargoTypes GetCargoTypesOfArticulatedParts(EngineID engine);
void AddArticulatedParts(Vehicle *first); void AddArticulatedParts(Vehicle *first);
void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, CargoTypes *union_mask, CargoTypes *intersection_mask); void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, CargoTypes *union_mask, CargoTypes *intersection_mask);
CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type); CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
CargoTypes GetCargoTypesOfArticulatedVehicle(const Vehicle *v, CargoID *cargo_type); CargoTypes GetCargoTypesOfArticulatedVehicle(const Vehicle *v, CargoType *cargo_type);
bool IsArticulatedVehicleRefittable(EngineID engine); bool IsArticulatedVehicleRefittable(EngineID engine);
bool IsArticulatedEngine(EngineID engine_type); bool IsArticulatedEngine(EngineID engine_type);
void CheckConsistencyOfArticulatedVehicle(const Vehicle *v); void CheckConsistencyOfArticulatedVehicle(const Vehicle *v);

12
src/autoreplace_cmd.cpp
View File

@ -187,7 +187,7 @@ static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, EngineID engine_ty
const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v; const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
for (const Order *o : u->Orders()) { for (const Order *o : u->Orders()) {
if (!o->IsRefit() || o->IsAutoRefit()) continue; if (!o->IsRefit() || o->IsAutoRefit()) continue;
CargoID cargo_type = o->GetRefitCargo(); CargoType cargo_type = o->GetRefitCargo();
if (!HasBit(union_refit_mask_a, cargo_type)) continue; if (!HasBit(union_refit_mask_a, cargo_type)) continue;
if (!HasBit(union_refit_mask_b, cargo_type)) return false; if (!HasBit(union_refit_mask_b, cargo_type)) return false;
@ -229,14 +229,14 @@ static int GetIncompatibleRefitOrderIdForAutoreplace(const Vehicle *v, EngineID
* CARGO_NO_REFIT is returned if no refit is needed * CARGO_NO_REFIT is returned if no refit is needed
* INVALID_CARGO is returned when both old and new vehicle got cargo capacity and refitting the new one to the old one's cargo type isn't possible * INVALID_CARGO is returned when both old and new vehicle got cargo capacity and refitting the new one to the old one's cargo type isn't possible
*/ */
static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool part_of_chain) static CargoType GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool part_of_chain)
{ {
CargoTypes available_cargo_types, union_mask; CargoTypes available_cargo_types, union_mask;
GetArticulatedRefitMasks(engine_type, true, &union_mask, &available_cargo_types); GetArticulatedRefitMasks(engine_type, true, &union_mask, &available_cargo_types);
if (union_mask == 0) return CARGO_NO_REFIT; // Don't try to refit an engine with no cargo capacity if (union_mask == 0) return CARGO_NO_REFIT; // Don't try to refit an engine with no cargo capacity
CargoID cargo_type; CargoType cargo_type;
CargoTypes cargo_mask = GetCargoTypesOfArticulatedVehicle(v, &cargo_type); CargoTypes cargo_mask = GetCargoTypesOfArticulatedVehicle(v, &cargo_type);
if (!HasAtMostOneBit(cargo_mask)) { if (!HasAtMostOneBit(cargo_mask)) {
CargoTypes new_engine_default_cargoes = GetCargoTypesOfArticulatedParts(engine_type); CargoTypes new_engine_default_cargoes = GetCargoTypesOfArticulatedParts(engine_type);
@ -247,7 +247,7 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
return INVALID_CARGO; // We cannot refit to mixed cargoes in an automated way return INVALID_CARGO; // We cannot refit to mixed cargoes in an automated way
} }
if (!IsValidCargoID(cargo_type)) { if (!IsValidCargoType(cargo_type)) {
if (v->type != VEH_TRAIN) return CARGO_NO_REFIT; // If the vehicle does not carry anything at all, every replacement is fine. if (v->type != VEH_TRAIN) return CARGO_NO_REFIT; // If the vehicle does not carry anything at all, every replacement is fine.
if (!part_of_chain) return CARGO_NO_REFIT; if (!part_of_chain) return CARGO_NO_REFIT;
@ -330,8 +330,8 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
if (e == INVALID_ENGINE) return CommandCost(); // neither autoreplace is set, nor autorenew is triggered if (e == INVALID_ENGINE) return CommandCost(); // neither autoreplace is set, nor autorenew is triggered
/* Does it need to be refitted */ /* Does it need to be refitted */
CargoID refit_cargo = GetNewCargoTypeForReplace(old_veh, e, part_of_chain); CargoType refit_cargo = GetNewCargoTypeForReplace(old_veh, e, part_of_chain);
if (!IsValidCargoID(refit_cargo)) { if (!IsValidCargoType(refit_cargo)) {
if (!IsLocalCompany() || (flags & DC_EXEC) == 0) return CommandCost(); if (!IsLocalCompany() || (flags & DC_EXEC) == 0) return CommandCost();
VehicleID old_veh_id = (old_veh->type == VEH_TRAIN) ? Train::From(old_veh)->First()->index : old_veh->index; VehicleID old_veh_id = (old_veh->type == VEH_TRAIN) ? Train::From(old_veh)->First()->index : old_veh->index;

40
src/build_vehicle_gui.cpp
View File

@ -99,7 +99,7 @@ bool _engine_sort_direction; ///< \c false = descending, \c true = ascending.
uint8_t _engine_sort_last_criteria[] = {0, 0, 0, 0}; ///< Last set sort criteria, for each vehicle type. uint8_t _engine_sort_last_criteria[] = {0, 0, 0, 0}; ///< Last set sort criteria, for each vehicle type.
bool _engine_sort_last_order[] = {false, false, false, false}; ///< Last set direction of the sort order, for each vehicle type. bool _engine_sort_last_order[] = {false, false, false, false}; ///< Last set direction of the sort order, for each vehicle type.
bool _engine_sort_show_hidden_engines[] = {false, false, false, false}; ///< Last set 'show hidden engines' setting for each vehicle type. bool _engine_sort_show_hidden_engines[] = {false, false, false, false}; ///< Last set 'show hidden engines' setting for each vehicle type.
static CargoID _engine_sort_last_cargo_criteria[] = {CargoFilterCriteria::CF_ANY, CargoFilterCriteria::CF_ANY, CargoFilterCriteria::CF_ANY, CargoFilterCriteria::CF_ANY}; ///< Last set filter criteria, for each vehicle type. static CargoType _engine_sort_last_cargo_criteria[] = {CargoFilterCriteria::CF_ANY, CargoFilterCriteria::CF_ANY, CargoFilterCriteria::CF_ANY, CargoFilterCriteria::CF_ANY}; ///< Last set filter criteria, for each vehicle type.
/** /**
* Determines order of engines by engineID * Determines order of engines by engineID
@ -534,15 +534,15 @@ const std::initializer_list<const StringID> _engine_sort_listing[] = {{
}}; }};
/** Filters vehicles by cargo and engine (in case of rail vehicle). */ /** Filters vehicles by cargo and engine (in case of rail vehicle). */
static bool CargoAndEngineFilter(const GUIEngineListItem *item, const CargoID cid) static bool CargoAndEngineFilter(const GUIEngineListItem *item, const CargoType cargo_type)
{ {
if (cid == CargoFilterCriteria::CF_ANY) { if (cargo_type == CargoFilterCriteria::CF_ANY) {
return true; return true;
} else if (cid == CargoFilterCriteria::CF_ENGINES) { } else if (cargo_type == CargoFilterCriteria::CF_ENGINES) {
return Engine::Get(item->engine_id)->GetPower() != 0; return Engine::Get(item->engine_id)->GetPower() != 0;
} else { } else {
CargoTypes refit_mask = GetUnionOfArticulatedRefitMasks(item->engine_id, true) & _standard_cargo_mask; CargoTypes refit_mask = GetUnionOfArticulatedRefitMasks(item->engine_id, true) & _standard_cargo_mask;
return (cid == CargoFilterCriteria::CF_NONE ? refit_mask == 0 : HasBit(refit_mask, cid)); return (cargo_type == CargoFilterCriteria::CF_NONE ? refit_mask == 0 : HasBit(refit_mask, cargo_type));
} }
} }
@ -553,7 +553,7 @@ static GUIEngineList::FilterFunction * const _engine_filter_funcs[] = {
static uint GetCargoWeight(const CargoArray &cap, VehicleType vtype) static uint GetCargoWeight(const CargoArray &cap, VehicleType vtype)
{ {
uint weight = 0; uint weight = 0;
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoType c = 0; c < NUM_CARGO; c++) {
if (cap[c] != 0) { if (cap[c] != 0) {
if (vtype == VEH_TRAIN) { if (vtype == VEH_TRAIN) {
weight += CargoSpec::Get(c)->WeightOfNUnitsInTrain(cap[c]); weight += CargoSpec::Get(c)->WeightOfNUnitsInTrain(cap[c]);
@ -568,11 +568,11 @@ static uint GetCargoWeight(const CargoArray &cap, VehicleType vtype)
static int DrawCargoCapacityInfo(int left, int right, int y, TestedEngineDetails &te, bool refittable) static int DrawCargoCapacityInfo(int left, int right, int y, TestedEngineDetails &te, bool refittable)
{ {
for (const CargoSpec *cs : _sorted_cargo_specs) { for (const CargoSpec *cs : _sorted_cargo_specs) {
CargoID cid = cs->Index(); CargoType cargo_type = cs->Index();
if (te.all_capacities[cid] == 0) continue; if (te.all_capacities[cargo_type] == 0) continue;
SetDParam(0, cid); SetDParam(0, cargo_type);
SetDParam(1, te.all_capacities[cid]); SetDParam(1, te.all_capacities[cargo_type]);
SetDParam(2, refittable ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY); SetDParam(2, refittable ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY);
DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY); DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
y += GetCharacterHeight(FS_NORMAL); y += GetCharacterHeight(FS_NORMAL);
@ -817,7 +817,7 @@ static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_
if (te.mail_capacity > 0) { if (te.mail_capacity > 0) {
SetDParam(0, te.cargo); SetDParam(0, te.cargo);
SetDParam(1, te.capacity); SetDParam(1, te.capacity);
SetDParam(2, GetCargoIDByLabel(CT_MAIL)); SetDParam(2, GetCargoTypeByLabel(CT_MAIL));
SetDParam(3, te.mail_capacity); SetDParam(3, te.mail_capacity);
DrawString(left, right, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY); DrawString(left, right, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY);
} else { } else {
@ -899,8 +899,8 @@ void TestedEngineDetails::FillDefaultCapacities(const Engine *e)
} else { } else {
this->capacity = e->GetDisplayDefaultCapacity(&this->mail_capacity); this->capacity = e->GetDisplayDefaultCapacity(&this->mail_capacity);
this->all_capacities[this->cargo] = this->capacity; this->all_capacities[this->cargo] = this->capacity;
if (IsValidCargoID(GetCargoIDByLabel(CT_MAIL))) { if (IsValidCargoType(GetCargoTypeByLabel(CT_MAIL))) {
this->all_capacities[GetCargoIDByLabel(CT_MAIL)] = this->mail_capacity; this->all_capacities[GetCargoTypeByLabel(CT_MAIL)] = this->mail_capacity;
} else { } else {
this->mail_capacity = 0; this->mail_capacity = 0;
} }
@ -1177,7 +1177,7 @@ struct BuildVehicleWindow : Window {
EngineID sel_engine; ///< Currently selected engine, or #INVALID_ENGINE EngineID sel_engine; ///< Currently selected engine, or #INVALID_ENGINE
EngineID rename_engine; ///< Engine being renamed. EngineID rename_engine; ///< Engine being renamed.
GUIEngineList eng_list; GUIEngineList eng_list;
CargoID cargo_filter_criteria; ///< Selected cargo filter CargoType cargo_filter_criteria; ///< Selected cargo filter
int details_height; ///< Minimal needed height of the details panels, in text lines (found so far). int details_height; ///< Minimal needed height of the details panels, in text lines (found so far).
Scrollbar *vscroll; Scrollbar *vscroll;
TestedEngineDetails te; ///< Tested cost and capacity after refit. TestedEngineDetails te; ///< Tested cost and capacity after refit.
@ -1287,13 +1287,13 @@ struct BuildVehicleWindow : Window {
} }
} }
StringID GetCargoFilterLabel(CargoID cid) const StringID GetCargoFilterLabel(CargoType cargo_type) const
{ {
switch (cid) { switch (cargo_type) {
case CargoFilterCriteria::CF_ANY: return STR_PURCHASE_INFO_ALL_TYPES; case CargoFilterCriteria::CF_ANY: return STR_PURCHASE_INFO_ALL_TYPES;
case CargoFilterCriteria::CF_ENGINES: return STR_PURCHASE_INFO_ENGINES_ONLY; case CargoFilterCriteria::CF_ENGINES: return STR_PURCHASE_INFO_ENGINES_ONLY;
case CargoFilterCriteria::CF_NONE: return STR_PURCHASE_INFO_NONE; case CargoFilterCriteria::CF_NONE: return STR_PURCHASE_INFO_NONE;
default: return CargoSpec::Get(cid)->name; default: return CargoSpec::Get(cargo_type)->name;
} }
} }
@ -1310,7 +1310,7 @@ struct BuildVehicleWindow : Window {
void SelectEngine(EngineID engine) void SelectEngine(EngineID engine)
{ {
CargoID cargo = this->cargo_filter_criteria; CargoType cargo = this->cargo_filter_criteria;
if (cargo == CargoFilterCriteria::CF_ANY || cargo == CargoFilterCriteria::CF_ENGINES || cargo == CargoFilterCriteria::CF_NONE) cargo = INVALID_CARGO; if (cargo == CargoFilterCriteria::CF_ANY || cargo == CargoFilterCriteria::CF_ENGINES || cargo == CargoFilterCriteria::CF_NONE) cargo = INVALID_CARGO;
this->sel_engine = engine; this->sel_engine = engine;
@ -1327,7 +1327,7 @@ struct BuildVehicleWindow : Window {
this->te.cost = ret.GetCost() - e->GetCost(); this->te.cost = ret.GetCost() - e->GetCost();
this->te.capacity = refit_capacity; this->te.capacity = refit_capacity;
this->te.mail_capacity = refit_mail; this->te.mail_capacity = refit_mail;
this->te.cargo = !IsValidCargoID(cargo) ? e->GetDefaultCargoType() : cargo; this->te.cargo = !IsValidCargoType(cargo) ? e->GetDefaultCargoType() : cargo;
this->te.all_capacities = cargo_capacities; this->te.all_capacities = cargo_capacities;
return; return;
} }
@ -1607,7 +1607,7 @@ struct BuildVehicleWindow : Window {
EngineID sel_eng = this->sel_engine; EngineID sel_eng = this->sel_engine;
if (sel_eng == INVALID_ENGINE) return; if (sel_eng == INVALID_ENGINE) return;
CargoID cargo = this->cargo_filter_criteria; CargoType cargo = this->cargo_filter_criteria;
if (cargo == CargoFilterCriteria::CF_ANY || cargo == CargoFilterCriteria::CF_ENGINES || cargo == CargoFilterCriteria::CF_NONE) cargo = INVALID_CARGO; if (cargo == CargoFilterCriteria::CF_ANY || cargo == CargoFilterCriteria::CF_ENGINES || cargo == CargoFilterCriteria::CF_NONE) cargo = INVALID_CARGO;
if (this->vehicle_type == VEH_TRAIN && RailVehInfo(sel_eng)->railveh_type == RAILVEH_WAGON) { if (this->vehicle_type == VEH_TRAIN && RailVehInfo(sel_eng)->railveh_type == RAILVEH_WAGON) {
Command<CMD_BUILD_VEHICLE>::Post(GetCmdBuildVehMsg(this->vehicle_type), CcBuildWagon, TileIndex(this->window_number), sel_eng, true, cargo, INVALID_CLIENT_ID); Command<CMD_BUILD_VEHICLE>::Post(GetCmdBuildVehMsg(this->vehicle_type), CcBuildWagon, TileIndex(this->window_number), sel_eng, true, cargo, INVALID_CLIENT_ID);

28
src/cargo_type.h
View File

@ -19,7 +19,7 @@ using CargoLabel = StrongType::Typedef<uint32_t, struct CargoLabelTag, StrongTyp
/** /**
* Cargo slots to indicate a cargo type within a game. * Cargo slots to indicate a cargo type within a game.
*/ */
using CargoID = uint8_t; using CargoType = uint8_t;
/** /**
* Available types of cargo * Available types of cargo
@ -70,14 +70,14 @@ static constexpr CargoLabel CT_NONE = CT_PASSENGERS;
static constexpr CargoLabel CT_INVALID{UINT32_MAX}; ///< Invalid cargo type. static constexpr CargoLabel CT_INVALID{UINT32_MAX}; ///< Invalid cargo type.
static const CargoID NUM_ORIGINAL_CARGO = 12; ///< Original number of cargo types. static const CargoType NUM_ORIGINAL_CARGO = 12; ///< Original number of cargo types.
static const CargoID NUM_CARGO = 64; ///< Maximum number of cargo types in a game. static const CargoType NUM_CARGO = 64; ///< Maximum number of cargo types in a game.
/* CARGO_AUTO_REFIT and CARGO_NO_REFIT are stored in save-games for refit-orders, so should not be changed. */ /* CARGO_AUTO_REFIT and CARGO_NO_REFIT are stored in save-games for refit-orders, so should not be changed. */
static const CargoID CARGO_AUTO_REFIT = 0xFD; ///< Automatically choose cargo type when doing auto refitting. static const CargoType CARGO_AUTO_REFIT = 0xFD; ///< Automatically choose cargo type when doing auto refitting.
static const CargoID CARGO_NO_REFIT = 0xFE; ///< Do not refit cargo of a vehicle (used in vehicle orders and auto-replace/auto-renew). static const CargoType CARGO_NO_REFIT = 0xFE; ///< Do not refit cargo of a vehicle (used in vehicle orders and auto-replace/auto-renew).
static const CargoID INVALID_CARGO = UINT8_MAX; static const CargoType INVALID_CARGO = UINT8_MAX;
/** Mixed cargo types for definitions with cargo that can vary depending on climate. */ /** Mixed cargo types for definitions with cargo that can vary depending on climate. */
enum MixedCargoType { enum MixedCargoType {
@ -91,18 +91,18 @@ enum MixedCargoType {
* These are used by user interface code only and must not be assigned to any entity. Not all values are valid for every UI filter. * These are used by user interface code only and must not be assigned to any entity. Not all values are valid for every UI filter.
*/ */
namespace CargoFilterCriteria { namespace CargoFilterCriteria {
static constexpr CargoID CF_ANY = NUM_CARGO; ///< Show all items independent of carried cargo (i.e. no filtering) static constexpr CargoType CF_ANY = NUM_CARGO; ///< Show all items independent of carried cargo (i.e. no filtering)
static constexpr CargoID CF_NONE = NUM_CARGO + 1; ///< Show only items which do not carry cargo (e.g. train engines) static constexpr CargoType CF_NONE = NUM_CARGO + 1; ///< Show only items which do not carry cargo (e.g. train engines)
static constexpr CargoID CF_ENGINES = NUM_CARGO + 2; ///< Show only engines (for rail vehicles only) static constexpr CargoType CF_ENGINES = NUM_CARGO + 2; ///< Show only engines (for rail vehicles only)
static constexpr CargoID CF_FREIGHT = NUM_CARGO + 3; ///< Show only vehicles which carry any freight (non-passenger) cargo static constexpr CargoType CF_FREIGHT = NUM_CARGO + 3; ///< Show only vehicles which carry any freight (non-passenger) cargo
static constexpr CargoID CF_NO_RATING = NUM_CARGO + 4; ///< Show items with no rating (station list) static constexpr CargoType CF_NO_RATING = NUM_CARGO + 4; ///< Show items with no rating (station list)
static constexpr CargoID CF_SELECT_ALL = NUM_CARGO + 5; ///< Select all items (station list) static constexpr CargoType CF_SELECT_ALL = NUM_CARGO + 5; ///< Select all items (station list)
static constexpr CargoID CF_EXPAND_LIST = NUM_CARGO + 6; ///< Expand list to show all items (station list) static constexpr CargoType CF_EXPAND_LIST = NUM_CARGO + 6; ///< Expand list to show all items (station list)
}; };
/** Test whether cargo type is not INVALID_CARGO */ /** Test whether cargo type is not INVALID_CARGO */
inline bool IsValidCargoID(CargoID t) { return t != INVALID_CARGO; } inline bool IsValidCargoType(CargoType t) { return t != INVALID_CARGO; }
typedef uint64_t CargoTypes; typedef uint64_t CargoTypes;

4
src/cargoaction.h
View File

@ -40,9 +40,9 @@ class CargoDelivery : public CargoRemoval<VehicleCargoList> {
protected: protected:
TileIndex current_tile; ///< Current tile cargo delivery is happening. TileIndex current_tile; ///< Current tile cargo delivery is happening.
CargoPayment *payment; ///< Payment object where payments will be registered. CargoPayment *payment; ///< Payment object where payments will be registered.
CargoID cargo; ///< The cargo type of the cargo. CargoType cargo; ///< The cargo type of the cargo.
public: public:
CargoDelivery(VehicleCargoList *source, uint max_move, CargoID cargo, CargoPayment *payment, TileIndex current_tile) : CargoDelivery(VehicleCargoList *source, uint max_move, CargoType cargo, CargoPayment *payment, TileIndex current_tile) :
CargoRemoval<VehicleCargoList>(source, max_move), current_tile(current_tile), payment(payment), cargo(cargo) {} CargoRemoval<VehicleCargoList>(source, max_move), current_tile(current_tile), payment(payment), cargo(cargo) {}
bool operator()(CargoPacket *cp); bool operator()(CargoPacket *cp);
}; };

2
src/cargomonitor.cpp
View File

@ -115,7 +115,7 @@ int32_t GetPickupAmount(CargoMonitorID monitor, bool keep_monitoring)
* @param st station where the cargo is delivered to. * @param st station where the cargo is delivered to.
* @param dest industry index where the cargo is delivered to. * @param dest industry index where the cargo is delivered to.
*/ */
void AddCargoDelivery(CargoID cargo_type, CompanyID company, uint32_t amount, SourceType src_type, SourceID src, const Station *st, IndustryID dest) void AddCargoDelivery(CargoType cargo_type, CompanyID company, uint32_t amount, SourceType src_type, SourceID src, const Station *st, IndustryID dest)
{ {
if (amount == 0) return; if (amount == 0) return;

8
src/cargomonitor.h
View File

@ -55,7 +55,7 @@ static_assert(MAX_COMPANIES <= (1 << CCB_COMPANY_LENGTH));
* @param ind %Industry providing or accepting the cargo. * @param ind %Industry providing or accepting the cargo.
* @return The encoded cargo/company/industry number. * @return The encoded cargo/company/industry number.
*/ */
inline CargoMonitorID EncodeCargoIndustryMonitor(CompanyID company, CargoID ctype, IndustryID ind) inline CargoMonitorID EncodeCargoIndustryMonitor(CompanyID company, CargoType ctype, IndustryID ind)
{ {
assert(ctype < (1 << CCB_CARGO_TYPE_LENGTH)); assert(ctype < (1 << CCB_CARGO_TYPE_LENGTH));
assert(company < (1 << CCB_COMPANY_LENGTH)); assert(company < (1 << CCB_COMPANY_LENGTH));
@ -75,7 +75,7 @@ inline CargoMonitorID EncodeCargoIndustryMonitor(CompanyID company, CargoID ctyp
* @param town %Town providing or accepting the cargo. * @param town %Town providing or accepting the cargo.
* @return The encoded cargo/company/town number. * @return The encoded cargo/company/town number.
*/ */
inline CargoMonitorID EncodeCargoTownMonitor(CompanyID company, CargoID ctype, TownID town) inline CargoMonitorID EncodeCargoTownMonitor(CompanyID company, CargoType ctype, TownID town)
{ {
assert(ctype < (1 << CCB_CARGO_TYPE_LENGTH)); assert(ctype < (1 << CCB_CARGO_TYPE_LENGTH));
assert(company < (1 << CCB_COMPANY_LENGTH)); assert(company < (1 << CCB_COMPANY_LENGTH));
@ -102,7 +102,7 @@ inline CompanyID DecodeMonitorCompany(CargoMonitorID num)
* @param num Cargo monitoring number to decode. * @param num Cargo monitoring number to decode.
* @return The extracted cargo type. * @return The extracted cargo type.
*/ */
inline CargoID DecodeMonitorCargoType(CargoMonitorID num) inline CargoType DecodeMonitorCargoType(CargoMonitorID num)
{ {
return GB(num, CCB_CARGO_TYPE_START, CCB_CARGO_TYPE_LENGTH); return GB(num, CCB_CARGO_TYPE_START, CCB_CARGO_TYPE_LENGTH);
} }
@ -143,6 +143,6 @@ void ClearCargoPickupMonitoring(CompanyID company = INVALID_OWNER);
void ClearCargoDeliveryMonitoring(CompanyID company = INVALID_OWNER); void ClearCargoDeliveryMonitoring(CompanyID company = INVALID_OWNER);
int32_t GetDeliveryAmount(CargoMonitorID monitor, bool keep_monitoring); int32_t GetDeliveryAmount(CargoMonitorID monitor, bool keep_monitoring);
int32_t GetPickupAmount(CargoMonitorID monitor, bool keep_monitoring); int32_t GetPickupAmount(CargoMonitorID monitor, bool keep_monitoring);
void AddCargoDelivery(CargoID cargo_type, CompanyID company, uint32_t amount, SourceType src_type, SourceID src, const Station *st, IndustryID dest = INVALID_INDUSTRY); void AddCargoDelivery(CargoType cargo_type, CompanyID company, uint32_t amount, SourceType src_type, SourceID src, const Station *st, IndustryID dest = INVALID_INDUSTRY);
#endif /* CARGOMONITOR_H */ #endif /* CARGOMONITOR_H */

4
src/cargopacket.cpp
View File

@ -437,7 +437,7 @@ void VehicleCargoList::AgeCargo()
* @param current_tile Current tile the cargo handling is happening on. * @param current_tile Current tile the cargo handling is happening on.
* return If any cargo will be unloaded. * return If any cargo will be unloaded.
*/ */
bool VehicleCargoList::Stage(bool accepted, StationID current_station, StationIDStack next_station, uint8_t order_flags, const GoodsEntry *ge, CargoID cargo, CargoPayment *payment, TileIndex current_tile) bool VehicleCargoList::Stage(bool accepted, StationID current_station, StationIDStack next_station, uint8_t order_flags, const GoodsEntry *ge, CargoType cargo, CargoPayment *payment, TileIndex current_tile)
{ {
this->AssertCountConsistency(); this->AssertCountConsistency();
assert(this->action_counts[MTA_LOAD] == 0); assert(this->action_counts[MTA_LOAD] == 0);
@ -628,7 +628,7 @@ uint VehicleCargoList::Shift(uint max_move, VehicleCargoList *dest)
* @param current_tile Current tile the cargo handling is happening on. * @param current_tile Current tile the cargo handling is happening on.
* @return Amount of cargo actually unloaded. * @return Amount of cargo actually unloaded.
*/ */
uint VehicleCargoList::Unload(uint max_move, StationCargoList *dest, CargoID cargo, CargoPayment *payment, TileIndex current_tile) uint VehicleCargoList::Unload(uint max_move, StationCargoList *dest, CargoType cargo, CargoPayment *payment, TileIndex current_tile)
{ {
uint moved = 0; uint moved = 0;
if (this->action_counts[MTA_TRANSFER] > 0) { if (this->action_counts[MTA_TRANSFER] > 0) {

4
src/cargopacket.h
View File

@ -478,7 +478,7 @@ public:
void InvalidateCache(); void InvalidateCache();
bool Stage(bool accepted, StationID current_station, StationIDStack next_station, uint8_t order_flags, const GoodsEntry *ge, CargoID cargo, CargoPayment *payment, TileIndex current_tile); bool Stage(bool accepted, StationID current_station, StationIDStack next_station, uint8_t order_flags, const GoodsEntry *ge, CargoType cargo, CargoPayment *payment, TileIndex current_tile);
/** /**
* Marks all cargo in the vehicle as to be kept. This is mostly useful for * Marks all cargo in the vehicle as to be kept. This is mostly useful for
@ -498,7 +498,7 @@ public:
template <MoveToAction Tfrom, MoveToAction Tto> template <MoveToAction Tfrom, MoveToAction Tto>
uint Reassign(uint max_move); uint Reassign(uint max_move);
uint Return(uint max_move, StationCargoList *dest, StationID next_station, TileIndex current_tile); uint Return(uint max_move, StationCargoList *dest, StationID next_station, TileIndex current_tile);
uint Unload(uint max_move, StationCargoList *dest, CargoID cargo, CargoPayment *payment, TileIndex current_tile); uint Unload(uint max_move, StationCargoList *dest, CargoType cargo, CargoPayment *payment, TileIndex current_tile);
uint Shift(uint max_move, VehicleCargoList *dest); uint Shift(uint max_move, VehicleCargoList *dest);
uint Truncate(uint max_move = UINT_MAX); uint Truncate(uint max_move = UINT_MAX);
uint Reroute(uint max_move, VehicleCargoList *dest, StationID avoid, StationID avoid2, const GoodsEntry *ge); uint Reroute(uint max_move, VehicleCargoList *dest, StationID avoid, StationID avoid2, const GoodsEntry *ge);

18
src/cargotype.cpp
View File

@ -46,7 +46,7 @@ static std::vector<CargoLabel> _default_cargo_labels;
/** /**
* Default cargo translation for upto version 7 NewGRFs. * Default cargo translation for upto version 7 NewGRFs.
* This maps the original 12 cargo slots to their original label. If a climate dependent cargo is not present it will * This maps the original 12 cargo slots to their original label. If a climate dependent cargo is not present it will
* map to CT_INVALID. For default cargoes this ends up as a 1:1 mapping via climate slot -> label -> cargo ID. * map to CT_INVALID. For default cargoes this ends up as a 1:1 mapping via climate slot -> label -> cargo type.
*/ */
static std::array<CargoLabel, 12> _climate_dependent_cargo_labels; static std::array<CargoLabel, 12> _climate_dependent_cargo_labels;
@ -146,12 +146,12 @@ void BuildCargoLabelMap()
/** /**
* Test if a cargo is a default cargo type. * Test if a cargo is a default cargo type.
* @param cid Cargo ID. * @param cargo_type Cargo type.
* @returns true iff the cargo type is a default cargo type. * @returns true iff the cargo type is a default cargo type.
*/ */
bool IsDefaultCargo(CargoID cid) bool IsDefaultCargo(CargoType cargo_type)
{ {
auto cs = CargoSpec::Get(cid); auto cs = CargoSpec::Get(cargo_type);
if (!cs->IsValid()) return false; if (!cs->IsValid()) return false;
CargoLabel label = cs->label; CargoLabel label = cs->label;
@ -188,7 +188,7 @@ SpriteID CargoSpec::GetCargoIcon() const
return sprite; return sprite;
} }
std::array<uint8_t, NUM_CARGO> _sorted_cargo_types; ///< Sort order of cargoes by cargo ID. std::array<uint8_t, NUM_CARGO> _sorted_cargo_types; ///< Sort order of cargoes by cargo type.
std::vector<const CargoSpec *> _sorted_cargo_specs; ///< Cargo specifications sorted alphabetically by name. std::vector<const CargoSpec *> _sorted_cargo_specs; ///< Cargo specifications sorted alphabetically by name.
std::span<const CargoSpec *> _sorted_standard_cargo_specs; ///< Standard cargo specifications sorted alphabetically by name. std::span<const CargoSpec *> _sorted_standard_cargo_specs; ///< Standard cargo specifications sorted alphabetically by name.
@ -276,15 +276,15 @@ std::optional<std::string> BuildCargoAcceptanceString(const CargoArray &acceptan
bool found = false; bool found = false;
for (const CargoSpec *cs : _sorted_cargo_specs) { for (const CargoSpec *cs : _sorted_cargo_specs) {
CargoID cid = cs->Index(); CargoType cargo_type = cs->Index();
if (acceptance[cid] > 0) { if (acceptance[cargo_type] > 0) {
/* Add a comma between each item. */ /* Add a comma between each item. */
if (found) line << list_separator; if (found) line << list_separator;
found = true; found = true;
/* If the accepted value is less than 8, show it in 1/8:ths */ /* If the accepted value is less than 8, show it in 1/8:ths */
if (acceptance[cid] < 8) { if (acceptance[cargo_type] < 8) {
SetDParam(0, acceptance[cid]); SetDParam(0, acceptance[cargo_type]);
SetDParam(1, cs->name); SetDParam(1, cs->name);
line << GetString(STR_LAND_AREA_INFORMATION_CARGO_EIGHTS); line << GetString(STR_LAND_AREA_INFORMATION_CARGO_EIGHTS);
} else { } else {

24
src/cargotype.h
View File

@ -107,7 +107,7 @@ struct CargoSpec {
* Determines index of this cargospec * Determines index of this cargospec
* @return index (in the CargoSpec::array array) * @return index (in the CargoSpec::array array)
*/ */
inline CargoID Index() const inline CargoType Index() const
{ {
return this - CargoSpec::array; return this - CargoSpec::array;
} }
@ -132,9 +132,9 @@ struct CargoSpec {
} }
/** /**
* Retrieve cargo details for the given cargo ID * Retrieve cargo details for the given cargo type
* @param index ID of cargo * @param index ID of cargo
* @pre index is a valid cargo ID * @pre index is a valid cargo type
*/ */
static inline CargoSpec *Get(size_t index) static inline CargoSpec *Get(size_t index)
{ {
@ -199,11 +199,11 @@ struct CargoSpec {
private: private:
static CargoSpec array[NUM_CARGO]; ///< Array holding all CargoSpecs static CargoSpec array[NUM_CARGO]; ///< Array holding all CargoSpecs
static inline std::map<CargoLabel, CargoID> label_map{}; ///< Translation map from CargoLabel to Cargo ID. static inline std::map<CargoLabel, CargoType> label_map{}; ///< Translation map from CargoLabel to Cargo type.
friend void SetupCargoForClimate(LandscapeID l); friend void SetupCargoForClimate(LandscapeID l);
friend void BuildCargoLabelMap(); friend void BuildCargoLabelMap();
friend inline CargoID GetCargoIDByLabel(CargoLabel ct); friend inline CargoType GetCargoTypeByLabel(CargoLabel ct);
friend void FinaliseCargoArray(); friend void FinaliseCargoArray();
}; };
@ -211,12 +211,12 @@ extern CargoTypes _cargo_mask;
extern CargoTypes _standard_cargo_mask; extern CargoTypes _standard_cargo_mask;
void SetupCargoForClimate(LandscapeID l); void SetupCargoForClimate(LandscapeID l);
bool IsDefaultCargo(CargoID cid); bool IsDefaultCargo(CargoType cargo_type);
void BuildCargoLabelMap(); void BuildCargoLabelMap();
std::optional<std::string> BuildCargoAcceptanceString(const CargoArray &acceptance, StringID label); std::optional<std::string> BuildCargoAcceptanceString(const CargoArray &acceptance, StringID label);
inline CargoID GetCargoIDByLabel(CargoLabel label) inline CargoType GetCargoTypeByLabel(CargoLabel label)
{ {
auto found = CargoSpec::label_map.find(label); auto found = CargoSpec::label_map.find(label);
if (found != std::end(CargoSpec::label_map)) return found->second; if (found != std::end(CargoSpec::label_map)) return found->second;
@ -236,16 +236,16 @@ extern std::span<const CargoSpec *> _sorted_standard_cargo_specs;
* @param cc Cargo class. * @param cc Cargo class.
* @return The type fits in the class. * @return The type fits in the class.
*/ */
inline bool IsCargoInClass(CargoID c, CargoClass cc) inline bool IsCargoInClass(CargoType c, CargoClass cc)
{ {
return (CargoSpec::Get(c)->classes & cc) != 0; return (CargoSpec::Get(c)->classes & cc) != 0;
} }
using SetCargoBitIterator = SetBitIterator<CargoID, CargoTypes>; using SetCargoBitIterator = SetBitIterator<CargoType, CargoTypes>;
/** Comparator to sort CargoID by according to desired order. */ /** Comparator to sort CargoType by according to desired order. */
struct CargoIDComparator { struct CargoTypeComparator {
bool operator() (const CargoID &lhs, const CargoID &rhs) const { return _sorted_cargo_types[lhs] < _sorted_cargo_types[rhs]; } bool operator() (const CargoType &lhs, const CargoType &rhs) const { return _sorted_cargo_types[lhs] < _sorted_cargo_types[rhs]; }
}; };
#endif /* CARGOTYPE_H */ #endif /* CARGOTYPE_H */

2
src/depot_gui.cpp
View File

@ -889,7 +889,7 @@ struct DepotWindow : Window {
details.clear(); details.clear();
for (const CargoSpec *cs : _sorted_cargo_specs) { for (const CargoSpec *cs : _sorted_cargo_specs) {
CargoID cargo_type = cs->Index(); CargoType cargo_type = cs->Index();
if (capacity[cargo_type] == 0) continue; if (capacity[cargo_type] == 0) continue;
SetDParam(0, cargo_type); // {CARGO} #1 SetDParam(0, cargo_type); // {CARGO} #1

40
src/economy.cpp
View File

@ -979,7 +979,7 @@ Money GetPrice(Price index, uint cost_factor, const GRFFile *grf_file, int shift
return cost; return cost;
} }
Money GetTransportedGoodsIncome(uint num_pieces, uint dist, uint16_t transit_periods, CargoID cargo_type) Money GetTransportedGoodsIncome(uint num_pieces, uint dist, uint16_t transit_periods, CargoType cargo_type)
{ {
const CargoSpec *cs = CargoSpec::Get(cargo_type); const CargoSpec *cs = CargoSpec::Get(cargo_type);
if (!cs->IsValid()) { if (!cs->IsValid()) {
@ -1053,7 +1053,7 @@ static SmallIndustryList _cargo_delivery_destinations;
* @param company The company delivering the cargo * @param company The company delivering the cargo
* @return actually accepted pieces of cargo * @return actually accepted pieces of cargo
*/ */
static uint DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, uint num_pieces, IndustryID source, CompanyID company) static uint DeliverGoodsToIndustry(const Station *st, CargoType cargo_type, uint num_pieces, IndustryID source, CompanyID company)
{ {
/* Find the nearest industrytile to the station sign inside the catchment area, whose industry accepts the cargo. /* Find the nearest industrytile to the station sign inside the catchment area, whose industry accepts the cargo.
* This fails in three cases: * This fails in three cases:
@ -1108,7 +1108,7 @@ static uint DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, uint n
* @return Revenue for delivering cargo * @return Revenue for delivering cargo
* @note The cargo is just added to the stockpile of the industry. It is due to the caller to trigger the industry's production machinery * @note The cargo is just added to the stockpile of the industry. It is due to the caller to trigger the industry's production machinery
*/ */
static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID dest, uint distance, uint16_t periods_in_transit, Company *company, SourceType src_type, SourceID src) static Money DeliverGoods(int num_pieces, CargoType cargo_type, StationID dest, uint distance, uint16_t periods_in_transit, Company *company, SourceType src_type, SourceID src)
{ {
assert(num_pieces > 0); assert(num_pieces > 0);
@ -1173,10 +1173,10 @@ static void TriggerIndustryProduction(Industry *i)
} }
} else { } else {
for (auto ita = std::begin(i->accepted); ita != std::end(i->accepted); ++ita) { for (auto ita = std::begin(i->accepted); ita != std::end(i->accepted); ++ita) {
if (ita->waiting == 0 || !IsValidCargoID(ita->cargo)) continue; if (ita->waiting == 0 || !IsValidCargoType(ita->cargo)) continue;
for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) { for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) {
if (!IsValidCargoID(itp->cargo)) continue; if (!IsValidCargoType(itp->cargo)) continue;
itp->waiting = ClampTo<uint16_t>(itp->waiting + (ita->waiting * indspec->input_cargo_multiplier[ita - std::begin(i->accepted)][itp - std::begin(i->produced)] / 256)); itp->waiting = ClampTo<uint16_t>(itp->waiting + (ita->waiting * indspec->input_cargo_multiplier[ita - std::begin(i->accepted)][itp - std::begin(i->produced)] / 256));
} }
@ -1233,7 +1233,7 @@ CargoPayment::~CargoPayment()
* @param count The number of packets to pay for. * @param count The number of packets to pay for.
* @param current_tile Current tile the payment is happening on. * @param current_tile Current tile the payment is happening on.
*/ */
void CargoPayment::PayFinalDelivery(CargoID cargo, const CargoPacket *cp, uint count, TileIndex current_tile) void CargoPayment::PayFinalDelivery(CargoType cargo, const CargoPacket *cp, uint count, TileIndex current_tile)
{ {
if (this->owner == nullptr) { if (this->owner == nullptr) {
this->owner = Company::Get(this->front->owner); this->owner = Company::Get(this->front->owner);
@ -1255,7 +1255,7 @@ void CargoPayment::PayFinalDelivery(CargoID cargo, const CargoPacket *cp, uint c
* @param current_tile Current tile the payment is happening on. * @param current_tile Current tile the payment is happening on.
* @return The amount of money paid for the transfer. * @return The amount of money paid for the transfer.
*/ */
Money CargoPayment::PayTransfer(CargoID cargo, const CargoPacket *cp, uint count, TileIndex current_tile) Money CargoPayment::PayTransfer(CargoType cargo, const CargoPacket *cp, uint count, TileIndex current_tile)
{ {
/* Pay transfer vehicle the difference between the payment for the journey from /* Pay transfer vehicle the difference between the payment for the journey from
* the source to the current point, and the sum of the previous transfer payments */ * the source to the current point, and the sum of the previous transfer payments */
@ -1492,9 +1492,9 @@ struct FinalizeRefitAction
* @param consist_capleft Added cargo capacities in the consist. * @param consist_capleft Added cargo capacities in the consist.
* @param st Station the vehicle is loading at. * @param st Station the vehicle is loading at.
* @param next_station Possible next stations the vehicle can travel to. * @param next_station Possible next stations the vehicle can travel to.
* @param new_cid Target cargo for refit. * @param new_cargo_type Target cargo for refit.
*/ */
static void HandleStationRefit(Vehicle *v, CargoArray &consist_capleft, Station *st, StationIDStack next_station, CargoID new_cid) static void HandleStationRefit(Vehicle *v, CargoArray &consist_capleft, Station *st, StationIDStack next_station, CargoType new_cargo_type)
{ {
Vehicle *v_start = v->GetFirstEnginePart(); Vehicle *v_start = v->GetFirstEnginePart();
if (!IterateVehicleParts(v_start, IsEmptyAction())) return; if (!IterateVehicleParts(v_start, IsEmptyAction())) return;
@ -1506,38 +1506,38 @@ static void HandleStationRefit(Vehicle *v, CargoArray &consist_capleft, Station
/* Remove old capacity from consist capacity and collect refit mask. */ /* Remove old capacity from consist capacity and collect refit mask. */
IterateVehicleParts(v_start, PrepareRefitAction(consist_capleft, refit_mask)); IterateVehicleParts(v_start, PrepareRefitAction(consist_capleft, refit_mask));
bool is_auto_refit = new_cid == CARGO_AUTO_REFIT; bool is_auto_refit = new_cargo_type == CARGO_AUTO_REFIT;
if (is_auto_refit) { if (is_auto_refit) {
/* Get a refittable cargo type with waiting cargo for next_station or INVALID_STATION. */ /* Get a refittable cargo type with waiting cargo for next_station or INVALID_STATION. */
new_cid = v_start->cargo_type; new_cargo_type = v_start->cargo_type;
for (CargoID cid : SetCargoBitIterator(refit_mask)) { for (CargoType cargo_type : SetCargoBitIterator(refit_mask)) {
if (st->goods[cid].HasData() && st->goods[cid].GetData().cargo.HasCargoFor(next_station)) { if (st->goods[cargo_type].HasData() && st->goods[cargo_type].GetData().cargo.HasCargoFor(next_station)) {
/* Try to find out if auto-refitting would succeed. In case the refit is allowed, /* Try to find out if auto-refitting would succeed. In case the refit is allowed,
* the returned refit capacity will be greater than zero. */ * the returned refit capacity will be greater than zero. */
auto [cc, refit_capacity, mail_capacity, cargo_capacities] = Command<CMD_REFIT_VEHICLE>::Do(DC_QUERY_COST, v_start->index, cid, 0xFF, true, false, 1); // Auto-refit and only this vehicle including artic parts. auto [cc, refit_capacity, mail_capacity, cargo_capacities] = Command<CMD_REFIT_VEHICLE>::Do(DC_QUERY_COST, v_start->index, cargo_type, 0xFF, true, false, 1); // Auto-refit and only this vehicle including artic parts.
/* Try to balance different loadable cargoes between parts of the consist, so that /* Try to balance different loadable cargoes between parts of the consist, so that
* all of them can be loaded. Avoid a situation where all vehicles suddenly switch * all of them can be loaded. Avoid a situation where all vehicles suddenly switch
* to the first loadable cargo for which there is only one packet. If the capacities * to the first loadable cargo for which there is only one packet. If the capacities
* are equal refit to the cargo of which most is available. This is important for * are equal refit to the cargo of which most is available. This is important for
* consists of only a single vehicle as those will generally have a consist_capleft * consists of only a single vehicle as those will generally have a consist_capleft
* of 0 for all cargoes. */ * of 0 for all cargoes. */
if (refit_capacity > 0 && (consist_capleft[cid] < consist_capleft[new_cid] || if (refit_capacity > 0 && (consist_capleft[cargo_type] < consist_capleft[new_cargo_type] ||
(consist_capleft[cid] == consist_capleft[new_cid] && (consist_capleft[cargo_type] == consist_capleft[new_cargo_type] &&
st->goods[cid].GetData().cargo.AvailableCount() > st->goods[new_cid].GetData().cargo.AvailableCount()))) { st->goods[cargo_type].GetData().cargo.AvailableCount() > st->goods[new_cargo_type].GetData().cargo.AvailableCount()))) {
new_cid = cid; new_cargo_type = cargo_type;
} }
} }
} }
} }
/* Refit if given a valid cargo. */ /* Refit if given a valid cargo. */
if (new_cid < NUM_CARGO && new_cid != v_start->cargo_type) { if (new_cargo_type < NUM_CARGO && new_cargo_type != v_start->cargo_type) {
/* INVALID_STATION because in the DT_MANUAL case that's correct and in the DT_(A)SYMMETRIC /* INVALID_STATION because in the DT_MANUAL case that's correct and in the DT_(A)SYMMETRIC
* cases the next hop of the vehicle doesn't really tell us anything if the cargo had been * cases the next hop of the vehicle doesn't really tell us anything if the cargo had been
* "via any station" before reserving. We rather produce some more "any station" cargo than * "via any station" before reserving. We rather produce some more "any station" cargo than
* misrouting it. */ * misrouting it. */
IterateVehicleParts(v_start, ReturnCargoAction(st, INVALID_STATION)); IterateVehicleParts(v_start, ReturnCargoAction(st, INVALID_STATION));
CommandCost cost = std::get<0>(Command<CMD_REFIT_VEHICLE>::Do(DC_EXEC, v_start->index, new_cid, 0xFF, true, false, 1)); // Auto-refit and only this vehicle including artic parts. CommandCost cost = std::get<0>(Command<CMD_REFIT_VEHICLE>::Do(DC_EXEC, v_start->index, new_cargo_type, 0xFF, true, false, 1)); // Auto-refit and only this vehicle including artic parts.
if (cost.Succeeded()) v->First()->profit_this_year -= cost.GetCost() << 8; if (cost.Succeeded()) v->First()->profit_this_year -= cost.GetCost() << 8;
} }

4
src/economy_base.h
View File

@ -36,8 +36,8 @@ struct CargoPayment : CargoPaymentPool::PoolItem<&_cargo_payment_pool> {
CargoPayment(Vehicle *front); CargoPayment(Vehicle *front);
~CargoPayment(); ~CargoPayment();
Money PayTransfer(CargoID cargo, const CargoPacket *cp, uint count, TileIndex current_tile); Money PayTransfer(CargoType cargo, const CargoPacket *cp, uint count, TileIndex current_tile);
void PayFinalDelivery(CargoID cargo, const CargoPacket *cp, uint count, TileIndex current_tile); void PayFinalDelivery(CargoType cargo, const CargoPacket *cp, uint count, TileIndex current_tile);
}; };
#endif /* ECONOMY_BASE_H */ #endif /* ECONOMY_BASE_H */

4
src/economy_func.h
View File

@ -30,8 +30,8 @@ extern Prices _price;
int UpdateCompanyRatingAndValue(Company *c, bool update); int UpdateCompanyRatingAndValue(Company *c, bool update);
void StartupIndustryDailyChanges(bool init_counter); void StartupIndustryDailyChanges(bool init_counter);
Money GetTransportedGoodsIncome(uint num_pieces, uint dist, uint16_t transit_periods, CargoID cargo_type); Money GetTransportedGoodsIncome(uint num_pieces, uint dist, uint16_t transit_periods, CargoType cargo_type);
uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, SourceID source_id, const StationList &all_stations, Owner exclusivity = INVALID_OWNER); uint MoveGoodsToStation(CargoType type, uint amount, SourceType source_type, SourceID source_id, const StationList &all_stations, Owner exclusivity = INVALID_OWNER);
void PrepareUnload(Vehicle *front_v); void PrepareUnload(Vehicle *front_v);
void LoadUnloadStation(Station *st); void LoadUnloadStation(Station *st);

20
src/engine.cpp
View File

@ -187,7 +187,7 @@ bool Engine::CanCarryCargo() const
default: NOT_REACHED(); default: NOT_REACHED();
} }
return IsValidCargoID(this->GetDefaultCargoType()); return IsValidCargoType(this->GetDefaultCargoType());
} }
@ -206,8 +206,8 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16_t *mail_capacity) const
if (!this->CanCarryCargo()) return 0; if (!this->CanCarryCargo()) return 0;
bool new_multipliers = HasBit(this->info.misc_flags, EF_NO_DEFAULT_CARGO_MULTIPLIER); bool new_multipliers = HasBit(this->info.misc_flags, EF_NO_DEFAULT_CARGO_MULTIPLIER);
CargoID default_cargo = this->GetDefaultCargoType(); CargoType default_cargo = this->GetDefaultCargoType();
CargoID cargo_type = (v != nullptr) ? v->cargo_type : default_cargo; CargoType cargo_type = (v != nullptr) ? v->cargo_type : default_cargo;
if (mail_capacity != nullptr && this->type == VEH_AIRCRAFT && IsCargoInClass(cargo_type, CC_PASSENGERS)) { if (mail_capacity != nullptr && this->type == VEH_AIRCRAFT && IsCargoInClass(cargo_type, CC_PASSENGERS)) {
*mail_capacity = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v); *mail_capacity = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
@ -244,10 +244,10 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16_t *mail_capacity) const
if (!IsCargoInClass(cargo_type, CC_PASSENGERS)) { if (!IsCargoInClass(cargo_type, CC_PASSENGERS)) {
extra_mail_cap = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v); extra_mail_cap = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
} }
if (IsValidCargoID(GetCargoIDByLabel(CT_MAIL))) { if (IsValidCargoType(GetCargoTypeByLabel(CT_MAIL))) {
if (!new_multipliers && cargo_type == GetCargoIDByLabel(CT_MAIL)) return capacity + extra_mail_cap; if (!new_multipliers && cargo_type == GetCargoTypeByLabel(CT_MAIL)) return capacity + extra_mail_cap;
} }
default_cargo = GetCargoIDByLabel(CT_PASSENGERS); // Always use 'passengers' wrt. cargo multipliers default_cargo = GetCargoTypeByLabel(CT_PASSENGERS); // Always use 'passengers' wrt. cargo multipliers
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
@ -264,8 +264,8 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16_t *mail_capacity) const
uint16_t default_multiplier = new_multipliers ? 0x100 : CargoSpec::Get(default_cargo)->multiplier; uint16_t default_multiplier = new_multipliers ? 0x100 : CargoSpec::Get(default_cargo)->multiplier;
uint16_t cargo_multiplier = CargoSpec::Get(cargo_type)->multiplier; uint16_t cargo_multiplier = CargoSpec::Get(cargo_type)->multiplier;
capacity *= cargo_multiplier; capacity *= cargo_multiplier;
if (extra_mail_cap > 0 && IsValidCargoID(GetCargoIDByLabel(CT_MAIL))) { if (extra_mail_cap > 0 && IsValidCargoType(GetCargoTypeByLabel(CT_MAIL))) {
uint mail_multiplier = CargoSpec::Get(GetCargoIDByLabel(CT_MAIL))->multiplier; uint mail_multiplier = CargoSpec::Get(GetCargoTypeByLabel(CT_MAIL))->multiplier;
capacity += (default_multiplier * extra_mail_cap * cargo_multiplier + mail_multiplier / 2) / mail_multiplier; capacity += (default_multiplier * extra_mail_cap * cargo_multiplier + mail_multiplier / 2) / mail_multiplier;
} }
capacity = (capacity + default_multiplier / 2) / default_multiplier; capacity = (capacity + default_multiplier / 2) / default_multiplier;
@ -1309,10 +1309,10 @@ bool IsEngineRefittable(EngineID engine)
if (HasBit(ei->callback_mask, CBM_VEHICLE_CARGO_SUFFIX)) return true; if (HasBit(ei->callback_mask, CBM_VEHICLE_CARGO_SUFFIX)) return true;
/* Is there any cargo except the default cargo? */ /* Is there any cargo except the default cargo? */
CargoID default_cargo = e->GetDefaultCargoType(); CargoType default_cargo = e->GetDefaultCargoType();
CargoTypes default_cargo_mask = 0; CargoTypes default_cargo_mask = 0;
SetBit(default_cargo_mask, default_cargo); SetBit(default_cargo_mask, default_cargo);
return IsValidCargoID(default_cargo) && ei->refit_mask != default_cargo_mask; return IsValidCargoType(default_cargo) && ei->refit_mask != default_cargo_mask;
} }
/** /**

4
src/engine_base.h
View File

@ -18,7 +18,7 @@
struct WagonOverride { struct WagonOverride {
std::vector<EngineID> engines; std::vector<EngineID> engines;
CargoID cargo; CargoType cargo;
const SpriteGroup *group; const SpriteGroup *group;
}; };
@ -97,7 +97,7 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
* @return The default cargo type. * @return The default cargo type.
* @see CanCarryCargo * @see CanCarryCargo
*/ */
CargoID GetDefaultCargoType() const CargoType GetDefaultCargoType() const
{ {
return this->info.cargo_type; return this->info.cargo_type;
} }

4
src/engine_gui.cpp
View File

@ -192,7 +192,7 @@ static StringID GetTrainEngineInfoString(const Engine *e)
static StringID GetAircraftEngineInfoString(const Engine *e) static StringID GetAircraftEngineInfoString(const Engine *e)
{ {
CargoID cargo = e->GetDefaultCargoType(); CargoType cargo = e->GetDefaultCargoType();
uint16_t mail_capacity; uint16_t mail_capacity;
uint capacity = e->GetDisplayDefaultCapacity(&mail_capacity); uint capacity = e->GetDisplayDefaultCapacity(&mail_capacity);
uint16_t range = e->GetRange(); uint16_t range = e->GetRange();
@ -211,7 +211,7 @@ static StringID GetAircraftEngineInfoString(const Engine *e)
SetDParam(9, mail_capacity > 0 ? STR_ENGINE_PREVIEW_CAPACITY_2 : STR_ENGINE_PREVIEW_CAPACITY); SetDParam(9, mail_capacity > 0 ? STR_ENGINE_PREVIEW_CAPACITY_2 : STR_ENGINE_PREVIEW_CAPACITY);
SetDParam(10, cargo); SetDParam(10, cargo);
SetDParam(11, capacity); SetDParam(11, capacity);
SetDParam(12, GetCargoIDByLabel(CT_MAIL)); SetDParam(12, GetCargoTypeByLabel(CT_MAIL));
SetDParam(13, mail_capacity); SetDParam(13, mail_capacity);
return STR_ENGINE_PREVIEW_TEXT4; return STR_ENGINE_PREVIEW_TEXT4;

2
src/engine_gui.h
View File

@ -27,7 +27,7 @@ struct GUIEngineListItem {
GUIEngineListItem(EngineID engine_id, EngineID variant_id, EngineDisplayFlags flags, uint8_t indent) : engine_id(engine_id), variant_id(variant_id), flags(flags), indent(indent), level_mask(0) {} GUIEngineListItem(EngineID engine_id, EngineID variant_id, EngineDisplayFlags flags, uint8_t indent) : engine_id(engine_id), variant_id(variant_id), flags(flags), indent(indent), level_mask(0) {}
}; };
typedef GUIList<GUIEngineListItem, std::nullptr_t, CargoID> GUIEngineList; typedef GUIList<GUIEngineListItem, std::nullptr_t, CargoType> GUIEngineList;
typedef bool EngList_SortTypeFunction(const GUIEngineListItem&, const GUIEngineListItem&); ///< argument type for #EngList_Sort. typedef bool EngList_SortTypeFunction(const GUIEngineListItem&, const GUIEngineListItem&); ///< argument type for #EngList_Sort.
void EngList_Sort(GUIEngineList &el, EngList_SortTypeFunction compare); void EngList_Sort(GUIEngineList &el, EngList_SortTypeFunction compare);

2
src/engine_type.h
View File

@ -152,7 +152,7 @@ struct EngineInfo {
uint8_t decay_speed; uint8_t decay_speed;
uint8_t load_amount; uint8_t load_amount;
uint8_t climates; ///< Climates supported by the engine. uint8_t climates; ///< Climates supported by the engine.
CargoID cargo_type; CargoType cargo_type;
std::variant<CargoLabel, MixedCargoType> cargo_label; std::variant<CargoLabel, MixedCargoType> cargo_label;
CargoTypes refit_mask; CargoTypes refit_mask;
uint8_t refit_cost; uint8_t refit_cost;

14
src/graph_gui.cpp
View File

@ -1518,7 +1518,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
int count = 0; int count = 0;
const Industry *i = Industry::Get(window_number); const Industry *i = Industry::Get(window_number);
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
count++; count++;
} }
this->vscroll->SetCount(count); this->vscroll->SetCount(count);
@ -1544,7 +1544,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
if (HasBit(_legend_excluded_cargo_production_history, p.cargo)) SetBit(this->excluded_data, p.cargo); if (HasBit(_legend_excluded_cargo_production_history, p.cargo)) SetBit(this->excluded_data, p.cargo);
} }
} }
@ -1559,7 +1559,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
const CargoSpec *cs; const CargoSpec *cs;
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
cs = CargoSpec::Get(p.cargo); cs = CargoSpec::Get(p.cargo);
SetDParam(0, cs->name); SetDParam(0, cs->name);
@ -1593,7 +1593,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
const CargoSpec *cs; const CargoSpec *cs;
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
if (pos-- > 0) continue; if (pos-- > 0) continue;
if (--max < 0) break; if (--max < 0) break;
@ -1634,7 +1634,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
/* Add all cargoes to the excluded lists. */ /* Add all cargoes to the excluded lists. */
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
SetBit(_legend_excluded_cargo_production_history, p.cargo); SetBit(_legend_excluded_cargo_production_history, p.cargo);
SetBit(this->excluded_data, p.cargo); SetBit(this->excluded_data, p.cargo);
@ -1649,7 +1649,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
if (row-- > 0) continue; if (row-- > 0) continue;
ToggleBit(_legend_excluded_cargo_production_history, p.cargo); ToggleBit(_legend_excluded_cargo_production_history, p.cargo);
@ -1700,7 +1700,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
this->data.clear(); this->data.clear();
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
const CargoSpec *cs = CargoSpec::Get(p.cargo); const CargoSpec *cs = CargoSpec::Get(p.cargo);
DataSet &produced = this->data.emplace_back(); DataSet &produced = this->data.emplace_back();

2
src/house.h
View File

@ -100,7 +100,7 @@ struct HouseSpec {
uint16_t remove_rating_decrease; ///< rating decrease if removed uint16_t remove_rating_decrease; ///< rating decrease if removed
uint8_t mail_generation; ///< mail generation multiplier (tile based, as the acceptances below) uint8_t mail_generation; ///< mail generation multiplier (tile based, as the acceptances below)
uint8_t cargo_acceptance[HOUSE_NUM_ACCEPTS]; ///< acceptance level for the cargo slots uint8_t cargo_acceptance[HOUSE_NUM_ACCEPTS]; ///< acceptance level for the cargo slots
CargoID accepts_cargo[HOUSE_NUM_ACCEPTS]; ///< input cargo slots CargoType accepts_cargo[HOUSE_NUM_ACCEPTS]; ///< input cargo slots
BuildingFlags building_flags; ///< some flags that describe the house (size, stadium etc...) BuildingFlags building_flags; ///< some flags that describe the house (size, stadium etc...)
HouseZones building_availability; ///< where can it be built (climates, zones) HouseZones building_availability; ///< where can it be built (climates, zones)
bool enabled; ///< the house is available to build (true by default, but can be disabled by newgrf) bool enabled; ///< the house is available to build (true by default, but can be disabled by newgrf)

36
src/industry.h
View File

@ -76,14 +76,14 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
}; };
struct ProducedCargo { struct ProducedCargo {
CargoID cargo; ///< Cargo type CargoType cargo; ///< Cargo type
uint16_t waiting; ///< Amount of cargo produced uint16_t waiting; ///< Amount of cargo produced
uint8_t rate; ///< Production rate uint8_t rate; ///< Production rate
std::array<ProducedHistory, 25> history; ///< History of cargo produced and transported for this month and 24 previous months std::array<ProducedHistory, 25> history; ///< History of cargo produced and transported for this month and 24 previous months
}; };
struct AcceptedCargo { struct AcceptedCargo {
CargoID cargo; ///< Cargo type CargoType cargo; ///< Cargo type
uint16_t waiting; ///< Amount of cargo waiting to processed uint16_t waiting; ///< Amount of cargo waiting to processed
TimerGameEconomy::Date last_accepted; ///< Last day cargo was accepted by this industry TimerGameEconomy::Date last_accepted; ///< Last day cargo was accepted by this industry
}; };
@ -161,45 +161,45 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
/** /**
* Get produced cargo slot for a specific cargo type. * Get produced cargo slot for a specific cargo type.
* @param cargo CargoID to find. * @param cargo CargoType to find.
* @return Iterator pointing to produced cargo slot if it exists, or the end iterator. * @return Iterator pointing to produced cargo slot if it exists, or the end iterator.
*/ */
inline ProducedCargoes::iterator GetCargoProduced(CargoID cargo) inline ProducedCargoes::iterator GetCargoProduced(CargoType cargo)
{ {
if (!IsValidCargoID(cargo)) return std::end(this->produced); if (!IsValidCargoType(cargo)) return std::end(this->produced);
return std::ranges::find(this->produced, cargo, &ProducedCargo::cargo); return std::ranges::find(this->produced, cargo, &ProducedCargo::cargo);
} }
/** /**
* Get produced cargo slot for a specific cargo type (const-variant). * Get produced cargo slot for a specific cargo type (const-variant).
* @param cargo CargoID to find. * @param cargo CargoType to find.
* @return Iterator pointing to produced cargo slot if it exists, or the end iterator. * @return Iterator pointing to produced cargo slot if it exists, or the end iterator.
*/ */
inline ProducedCargoes::const_iterator GetCargoProduced(CargoID cargo) const inline ProducedCargoes::const_iterator GetCargoProduced(CargoType cargo) const
{ {
if (!IsValidCargoID(cargo)) return std::end(this->produced); if (!IsValidCargoType(cargo)) return std::end(this->produced);
return std::ranges::find(this->produced, cargo, &ProducedCargo::cargo); return std::ranges::find(this->produced, cargo, &ProducedCargo::cargo);
} }
/** /**
* Get accepted cargo slot for a specific cargo type. * Get accepted cargo slot for a specific cargo type.
* @param cargo CargoID to find. * @param cargo CargoType to find.
* @return Iterator pointing to accepted cargo slot if it exists, or the end iterator. * @return Iterator pointing to accepted cargo slot if it exists, or the end iterator.
*/ */
inline AcceptedCargoes::iterator GetCargoAccepted(CargoID cargo) inline AcceptedCargoes::iterator GetCargoAccepted(CargoType cargo)
{ {
if (!IsValidCargoID(cargo)) return std::end(this->accepted); if (!IsValidCargoType(cargo)) return std::end(this->accepted);
return std::ranges::find(this->accepted, cargo, &AcceptedCargo::cargo); return std::ranges::find(this->accepted, cargo, &AcceptedCargo::cargo);
} }
/** /**
* Get accepted cargo slot for a specific cargo type (const-variant). * Get accepted cargo slot for a specific cargo type (const-variant).
* @param cargo CargoID to find. * @param cargo CargoType to find.
* @return Iterator pointing to accepted cargo slot if it exists, or the end iterator. * @return Iterator pointing to accepted cargo slot if it exists, or the end iterator.
*/ */
inline AcceptedCargoes::const_iterator GetCargoAccepted(CargoID cargo) const inline AcceptedCargoes::const_iterator GetCargoAccepted(CargoType cargo) const
{ {
if (!IsValidCargoID(cargo)) return std::end(this->accepted); if (!IsValidCargoType(cargo)) return std::end(this->accepted);
return std::ranges::find(this->accepted, cargo, &AcceptedCargo::cargo); return std::ranges::find(this->accepted, cargo, &AcceptedCargo::cargo);
} }
@ -207,27 +207,27 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
* Test if this industry accepts any cargo. * Test if this industry accepts any cargo.
* @return true iff the industry accepts any cargo. * @return true iff the industry accepts any cargo.
*/ */
bool IsCargoAccepted() const { return std::any_of(std::begin(this->accepted), std::end(this->accepted), [](const auto &a) { return IsValidCargoID(a.cargo); }); } bool IsCargoAccepted() const { return std::any_of(std::begin(this->accepted), std::end(this->accepted), [](const auto &a) { return IsValidCargoType(a.cargo); }); }
/** /**
* Test if this industry produces any cargo. * Test if this industry produces any cargo.
* @return true iff the industry produces any cargo. * @return true iff the industry produces any cargo.
*/ */
bool IsCargoProduced() const { return std::any_of(std::begin(this->produced), std::end(this->produced), [](const auto &p) { return IsValidCargoID(p.cargo); }); } bool IsCargoProduced() const { return std::any_of(std::begin(this->produced), std::end(this->produced), [](const auto &p) { return IsValidCargoType(p.cargo); }); }
/** /**
* Test if this industry accepts a specific cargo. * Test if this industry accepts a specific cargo.
* @param cargo Cargo type to test. * @param cargo Cargo type to test.
* @return true iff the industry accepts the given cargo type. * @return true iff the industry accepts the given cargo type.
*/ */
bool IsCargoAccepted(CargoID cargo) const { return std::any_of(std::begin(this->accepted), std::end(this->accepted), [&cargo](const auto &a) { return a.cargo == cargo; }); } bool IsCargoAccepted(CargoType cargo) const { return std::any_of(std::begin(this->accepted), std::end(this->accepted), [&cargo](const auto &a) { return a.cargo == cargo; }); }
/** /**
* Test if this industry produces a specific cargo. * Test if this industry produces a specific cargo.
* @param cargo Cargo type to test. * @param cargo Cargo type to test.
* @return true iff the industry produces the given cargo types. * @return true iff the industry produces the given cargo types.
*/ */
bool IsCargoProduced(CargoID cargo) const { return std::any_of(std::begin(this->produced), std::end(this->produced), [&cargo](const auto &p) { return p.cargo == cargo; }); } bool IsCargoProduced(CargoType cargo) const { return std::any_of(std::begin(this->produced), std::end(this->produced), [&cargo](const auto &p) { return p.cargo == cargo; }); }
/** /**
* Get the industry of the given tile * Get the industry of the given tile

40
src/industry_cmd.cpp
View File

@ -454,8 +454,8 @@ static void AddAcceptedCargo_Industry(TileIndex tile, CargoArray &acceptance, Ca
} }
for (uint8_t i = 0; i < std::size(itspec->accepts_cargo); i++) { for (uint8_t i = 0; i < std::size(itspec->accepts_cargo); i++) {
CargoID a = accepts_cargo[i]; CargoType a = accepts_cargo[i];
if (!IsValidCargoID(a) || cargo_acceptance[i] <= 0) continue; // work only with valid cargoes if (!IsValidCargoType(a) || cargo_acceptance[i] <= 0) continue; // work only with valid cargoes
/* Add accepted cargo */ /* Add accepted cargo */
acceptance[a] += cargo_acceptance[i]; acceptance[a] += cargo_acceptance[i];
@ -529,7 +529,7 @@ static bool TransportIndustryGoods(TileIndex tile)
for (auto &p : i->produced) { for (auto &p : i->produced) {
uint cw = ClampTo<uint8_t>(p.waiting); uint cw = ClampTo<uint8_t>(p.waiting);
if (cw > indspec->minimal_cargo && IsValidCargoID(p.cargo)) { if (cw > indspec->minimal_cargo && IsValidCargoType(p.cargo)) {
p.waiting -= cw; p.waiting -= cw;
/* fluctuating economy? */ /* fluctuating economy? */
@ -985,7 +985,7 @@ bool IsTileForestIndustry(TileIndex tile)
if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false; if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
/* Check for wood production */ /* Check for wood production */
return std::any_of(std::begin(ind->produced), std::end(ind->produced), [](const auto &p) { return IsValidCargoID(p.cargo) && CargoSpec::Get(p.cargo)->label == CT_WOOD; }); return std::any_of(std::begin(ind->produced), std::end(ind->produced), [](const auto &p) { return IsValidCargoType(p.cargo) && CargoSpec::Get(p.cargo)->label == CT_WOOD; });
} }
static const uint8_t _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6}; static const uint8_t _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6};
@ -1130,7 +1130,7 @@ static void ChopLumberMillTrees(Industry *i)
{ {
/* Don't process lumber mill if cargo is not set up correctly. */ /* Don't process lumber mill if cargo is not set up correctly. */
auto itp = std::begin(i->produced); auto itp = std::begin(i->produced);
if (itp == std::end(i->produced) || !IsValidCargoID(itp->cargo)) return; if (itp == std::end(i->produced) || !IsValidCargoType(itp->cargo)) return;
/* We only want to cut trees if all tiles are completed. */ /* We only want to cut trees if all tiles are completed. */
for (TileIndex tile_cur : i->location) { for (TileIndex tile_cur : i->location) {
@ -1153,7 +1153,7 @@ static void ChopLumberMillTrees(Industry *i)
static void ProduceIndustryGoodsHelper(Industry *i, bool scale) static void ProduceIndustryGoodsHelper(Industry *i, bool scale)
{ {
for (auto &p : i->produced) { for (auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
uint16_t amount = p.rate; uint16_t amount = p.rate;
if (scale) amount = ScaleByCargoScale(amount, false); if (scale) amount = ScaleByCargoScale(amount, false);
@ -1773,7 +1773,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
it = industries.emplace(it, i->index); it = industries.emplace(it, i->index);
for (size_t index = 0; index < std::size(indspec->produced_cargo); ++index) { for (size_t index = 0; index < std::size(indspec->produced_cargo); ++index) {
if (!IsValidCargoID(indspec->produced_cargo[index])) break; if (!IsValidCargoType(indspec->produced_cargo[index])) break;
Industry::ProducedCargo &p = i->produced.emplace_back(); Industry::ProducedCargo &p = i->produced.emplace_back();
p.cargo = indspec->produced_cargo[index]; p.cargo = indspec->produced_cargo[index];
@ -1781,7 +1781,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
} }
for (size_t index = 0; index < std::size(indspec->accepts_cargo); ++index) { for (size_t index = 0; index < std::size(indspec->accepts_cargo); ++index) {
if (!IsValidCargoID(indspec->accepts_cargo[index])) break; if (!IsValidCargoType(indspec->accepts_cargo[index])) break;
Industry::AcceptedCargo &a = i->accepted.emplace_back(); Industry::AcceptedCargo &a = i->accepted.emplace_back();
a.cargo = indspec->accepts_cargo[index]; a.cargo = indspec->accepts_cargo[index];
@ -1868,11 +1868,11 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
ErrorUnknownCallbackResult(indspec->grf_prop.grfid, CBID_INDUSTRY_INPUT_CARGO_TYPES, res); ErrorUnknownCallbackResult(indspec->grf_prop.grfid, CBID_INDUSTRY_INPUT_CARGO_TYPES, res);
break; break;
} }
CargoID cargo = GetCargoTranslation(GB(res, 0, 8), indspec->grf_prop.grffile); CargoType cargo = GetCargoTranslation(GB(res, 0, 8), indspec->grf_prop.grffile);
/* Industries without "unlimited" cargo types support depend on the specific order/slots of cargo types. /* Industries without "unlimited" cargo types support depend on the specific order/slots of cargo types.
* They need to be able to blank out specific slots without aborting the callback sequence, * They need to be able to blank out specific slots without aborting the callback sequence,
* and solve this by returning undefined cargo indexes. Skip these. */ * and solve this by returning undefined cargo indexes. Skip these. */
if (!IsValidCargoID(cargo) && !(indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED)) { if (!IsValidCargoType(cargo) && !(indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED)) {
/* As slots are allocated as needed now, this means we do need to add a slot for the invalid cargo. */ /* As slots are allocated as needed now, this means we do need to add a slot for the invalid cargo. */
Industry::AcceptedCargo &a = i->accepted.emplace_back(); Industry::AcceptedCargo &a = i->accepted.emplace_back();
a.cargo = INVALID_CARGO; a.cargo = INVALID_CARGO;
@ -1906,9 +1906,9 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
ErrorUnknownCallbackResult(indspec->grf_prop.grfid, CBID_INDUSTRY_OUTPUT_CARGO_TYPES, res); ErrorUnknownCallbackResult(indspec->grf_prop.grfid, CBID_INDUSTRY_OUTPUT_CARGO_TYPES, res);
break; break;
} }
CargoID cargo = GetCargoTranslation(GB(res, 0, 8), indspec->grf_prop.grffile); CargoType cargo = GetCargoTranslation(GB(res, 0, 8), indspec->grf_prop.grffile);
/* Allow older GRFs to skip slots. */ /* Allow older GRFs to skip slots. */
if (!IsValidCargoID(cargo) && !(indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED)) { if (!IsValidCargoType(cargo) && !(indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED)) {
/* As slots are allocated as needed now, this means we do need to add a slot for the invalid cargo. */ /* As slots are allocated as needed now, this means we do need to add a slot for the invalid cargo. */
Industry::ProducedCargo &p = i->produced.emplace_back(); Industry::ProducedCargo &p = i->produced.emplace_back();
p.cargo = INVALID_CARGO; p.cargo = INVALID_CARGO;
@ -2496,7 +2496,7 @@ void GenerateIndustries()
static void UpdateIndustryStatistics(Industry *i) static void UpdateIndustryStatistics(Industry *i)
{ {
for (auto &p : i->produced) { for (auto &p : i->produced) {
if (IsValidCargoID(p.cargo)) { if (IsValidCargoType(p.cargo)) {
if (p.history[THIS_MONTH].production != 0) i->last_prod_year = TimerGameEconomy::year; if (p.history[THIS_MONTH].production != 0) i->last_prod_year = TimerGameEconomy::year;
/* Move history from this month to last month. */ /* Move history from this month to last month. */
@ -2687,9 +2687,9 @@ static bool CheckIndustryCloseDownProtection(IndustryType type)
* @return: \c *c_accepts is set when industry accepts the cargo type, * @return: \c *c_accepts is set when industry accepts the cargo type,
* \c *c_produces is set when the industry produces the cargo type * \c *c_produces is set when the industry produces the cargo type
*/ */
static void CanCargoServiceIndustry(CargoID cargo, Industry *ind, bool *c_accepts, bool *c_produces) static void CanCargoServiceIndustry(CargoType cargo, Industry *ind, bool *c_accepts, bool *c_produces)
{ {
if (!IsValidCargoID(cargo)) return; if (!IsValidCargoType(cargo)) return;
/* Check for acceptance of cargo */ /* Check for acceptance of cargo */
if (ind->IsCargoAccepted(cargo) && !IndustryTemporarilyRefusesCargo(ind, cargo)) *c_accepts = true; if (ind->IsCargoAccepted(cargo) && !IndustryTemporarilyRefusesCargo(ind, cargo)) *c_accepts = true;
@ -2764,7 +2764,7 @@ int WhoCanServiceIndustry(Industry *ind)
* @param type: Cargo type that has changed * @param type: Cargo type that has changed
* @param percent: Percentage of change (>0 means increase, <0 means decrease) * @param percent: Percentage of change (>0 means increase, <0 means decrease)
*/ */
static void ReportNewsProductionChangeIndustry(Industry *ind, CargoID type, int percent) static void ReportNewsProductionChangeIndustry(Industry *ind, CargoType type, int percent)
{ {
NewsType nt; NewsType nt;
@ -2857,7 +2857,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
} else if (_settings_game.economy.type == ET_SMOOTH) { } else if (_settings_game.economy.type == ET_SMOOTH) {
closeit = !(i->ctlflags & (INDCTL_NO_CLOSURE | INDCTL_NO_PRODUCTION_DECREASE)); closeit = !(i->ctlflags & (INDCTL_NO_CLOSURE | INDCTL_NO_PRODUCTION_DECREASE));
for (auto &p : i->produced) { for (auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
uint32_t r = Random(); uint32_t r = Random();
int old_prod, new_prod, percent; int old_prod, new_prod, percent;
/* If over 60% is transported, mult is 1, else mult is -1. */ /* If over 60% is transported, mult is 1, else mult is -1. */
@ -2883,7 +2883,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
/* Prevent production to overflow or Oil Rig passengers to be over-"produced" */ /* Prevent production to overflow or Oil Rig passengers to be over-"produced" */
new_prod = Clamp(new_prod, 1, 255); new_prod = Clamp(new_prod, 1, 255);
if (IsValidCargoID(p.cargo) && p.cargo == GetCargoIDByLabel(CT_PASSENGERS) && !(indspec->behaviour & INDUSTRYBEH_NO_PAX_PROD_CLAMP)) { if (IsValidCargoType(p.cargo) && p.cargo == GetCargoTypeByLabel(CT_PASSENGERS) && !(indspec->behaviour & INDUSTRYBEH_NO_PAX_PROD_CLAMP)) {
new_prod = Clamp(new_prod, 0, 16); new_prod = Clamp(new_prod, 0, 16);
} }
@ -3212,11 +3212,11 @@ bool IndustryCompare::operator() (const IndustryListEntry &lhs, const IndustryLi
*/ */
void TrimIndustryAcceptedProduced(Industry *ind) void TrimIndustryAcceptedProduced(Industry *ind)
{ {
auto ita = std::find_if(std::rbegin(ind->accepted), std::rend(ind->accepted), [](const auto &a) { return IsValidCargoID(a.cargo); }); auto ita = std::find_if(std::rbegin(ind->accepted), std::rend(ind->accepted), [](const auto &a) { return IsValidCargoType(a.cargo); });
ind->accepted.erase(ita.base(), std::end(ind->accepted)); ind->accepted.erase(ita.base(), std::end(ind->accepted));
ind->accepted.shrink_to_fit(); ind->accepted.shrink_to_fit();
auto itp = std::find_if(std::rbegin(ind->produced), std::rend(ind->produced), [](const auto &p) { return IsValidCargoID(p.cargo); }); auto itp = std::find_if(std::rbegin(ind->produced), std::rend(ind->produced), [](const auto &p) { return IsValidCargoType(p.cargo); });
ind->produced.erase(itp.base(), std::end(ind->produced)); ind->produced.erase(itp.base(), std::end(ind->produced));
ind->produced.shrink_to_fit(); ind->produced.shrink_to_fit();
} }

216
src/industry_gui.cpp
View File

@ -161,7 +161,7 @@ static inline void GetAllCargoSuffixes(CargoSuffixInOut use_input, CargoSuffixTy
if (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) { if (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) {
/* Reworked behaviour with new many-in-many-out scheme */ /* Reworked behaviour with new many-in-many-out scheme */
for (uint j = 0; j < lengthof(suffixes); j++) { for (uint j = 0; j < lengthof(suffixes); j++) {
if (IsValidCargoID(cargoes[j])) { if (IsValidCargoType(cargoes[j])) {
uint8_t local_id = indspec->grf_prop.grffile->cargo_map[cargoes[j]]; // should we check the value for valid? uint8_t local_id = indspec->grf_prop.grffile->cargo_map[cargoes[j]]; // should we check the value for valid?
uint cargotype = local_id << 16 | use_input; uint cargotype = local_id << 16 | use_input;
GetCargoSuffix(cargotype, cst, ind, ind_type, indspec, suffixes[j]); GetCargoSuffix(cargotype, cst, ind, ind_type, indspec, suffixes[j]);
@ -179,14 +179,14 @@ static inline void GetAllCargoSuffixes(CargoSuffixInOut use_input, CargoSuffixTy
switch (use_input) { switch (use_input) {
case CARGOSUFFIX_OUT: case CARGOSUFFIX_OUT:
// Handle INDUSTRY_ORIGINAL_NUM_OUTPUTS cargoes // Handle INDUSTRY_ORIGINAL_NUM_OUTPUTS cargoes
if (IsValidCargoID(cargoes[0])) GetCargoSuffix(3, cst, ind, ind_type, indspec, suffixes[0]); if (IsValidCargoType(cargoes[0])) GetCargoSuffix(3, cst, ind, ind_type, indspec, suffixes[0]);
if (IsValidCargoID(cargoes[1])) GetCargoSuffix(4, cst, ind, ind_type, indspec, suffixes[1]); if (IsValidCargoType(cargoes[1])) GetCargoSuffix(4, cst, ind, ind_type, indspec, suffixes[1]);
break; break;
case CARGOSUFFIX_IN: case CARGOSUFFIX_IN:
// Handle INDUSTRY_ORIGINAL_NUM_INPUTS cargoes // Handle INDUSTRY_ORIGINAL_NUM_INPUTS cargoes
if (IsValidCargoID(cargoes[0])) GetCargoSuffix(0, cst, ind, ind_type, indspec, suffixes[0]); if (IsValidCargoType(cargoes[0])) GetCargoSuffix(0, cst, ind, ind_type, indspec, suffixes[0]);
if (IsValidCargoID(cargoes[1])) GetCargoSuffix(1, cst, ind, ind_type, indspec, suffixes[1]); if (IsValidCargoType(cargoes[1])) GetCargoSuffix(1, cst, ind, ind_type, indspec, suffixes[1]);
if (IsValidCargoID(cargoes[2])) GetCargoSuffix(2, cst, ind, ind_type, indspec, suffixes[2]); if (IsValidCargoType(cargoes[2])) GetCargoSuffix(2, cst, ind, ind_type, indspec, suffixes[2]);
break; break;
default: default:
NOT_REACHED(); NOT_REACHED();
@ -205,11 +205,11 @@ static inline void GetAllCargoSuffixes(CargoSuffixInOut use_input, CargoSuffixTy
* @param slot accepts/produced slot number, used for old-style 3-in/2-out industries. * @param slot accepts/produced slot number, used for old-style 3-in/2-out industries.
* @param suffix is filled with the suffix * @param suffix is filled with the suffix
*/ */
void GetCargoSuffix(CargoSuffixInOut use_input, CargoSuffixType cst, const Industry *ind, IndustryType ind_type, const IndustrySpec *indspec, CargoID cargo, uint8_t slot, CargoSuffix &suffix) void GetCargoSuffix(CargoSuffixInOut use_input, CargoSuffixType cst, const Industry *ind, IndustryType ind_type, const IndustrySpec *indspec, CargoType cargo, uint8_t slot, CargoSuffix &suffix)
{ {
suffix.text.clear(); suffix.text.clear();
suffix.display = CSD_CARGO; suffix.display = CSD_CARGO;
if (!IsValidCargoID(cargo)) return; if (!IsValidCargoType(cargo)) return;
if (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) { if (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) {
uint8_t local_id = indspec->grf_prop.grffile->cargo_map[cargo]; // should we check the value for valid? uint8_t local_id = indspec->grf_prop.grffile->cargo_map[cargo]; // should we check the value for valid?
uint cargotype = local_id << 16 | use_input; uint cargotype = local_id << 16 | use_input;
@ -364,13 +364,13 @@ class BuildIndustryWindow : public Window {
* - This cargo list uses the order defined by the industry, rather than alphabetic. * - This cargo list uses the order defined by the industry, rather than alphabetic.
* - NewGRF-supplied suffix strings can be attached to each cargo. * - NewGRF-supplied suffix strings can be attached to each cargo.
* *
* @param cargolist Array of CargoID to display * @param cargolist Array of CargoType to display
* @param cargo_suffix Array of suffixes to attach to each cargo * @param cargo_suffix Array of suffixes to attach to each cargo
* @param cargolistlen Length of arrays * @param cargolistlen Length of arrays
* @param prefixstr String to use for the first item * @param prefixstr String to use for the first item
* @return A formatted raw string * @return A formatted raw string
*/ */
std::string MakeCargoListString(const std::span<const CargoID> cargolist, const std::span<const CargoSuffix> cargo_suffix, StringID prefixstr) const std::string MakeCargoListString(const std::span<const CargoType> cargolist, const std::span<const CargoSuffix> cargo_suffix, StringID prefixstr) const
{ {
assert(cargolist.size() == cargo_suffix.size()); assert(cargolist.size() == cargo_suffix.size());
@ -379,7 +379,7 @@ class BuildIndustryWindow : public Window {
size_t firstcargo = 0; size_t firstcargo = 0;
for (size_t j = 0; j < cargolist.size(); j++) { for (size_t j = 0; j < cargolist.size(); j++) {
if (!IsValidCargoID(cargolist[j])) continue; if (!IsValidCargoType(cargolist[j])) continue;
numcargo++; numcargo++;
if (numcargo == 1) { if (numcargo == 1) {
firstcargo = j; firstcargo = j;
@ -858,10 +858,10 @@ public:
} }
} }
void DrawCargoIcon(const Rect &r, CargoID cid) const void DrawCargoIcon(const Rect &r, CargoType cargo_type) const
{ {
bool rtl = _current_text_dir == TD_RTL; bool rtl = _current_text_dir == TD_RTL;
SpriteID icon = CargoSpec::Get(cid)->GetCargoIcon(); SpriteID icon = CargoSpec::Get(cargo_type)->GetCargoIcon();
Dimension d = GetSpriteSize(icon); Dimension d = GetSpriteSize(icon);
Rect ir = r.WithWidth(this->cargo_icon_size.width, rtl).WithHeight(GetCharacterHeight(FS_NORMAL)); Rect ir = r.WithWidth(this->cargo_icon_size.width, rtl).WithHeight(GetCharacterHeight(FS_NORMAL));
DrawSprite(icon, PAL_NONE, CenterBounds(ir.left, ir.right, d.width), CenterBounds(ir.top, ir.bottom, this->cargo_icon_size.height)); DrawSprite(icon, PAL_NONE, CenterBounds(ir.left, ir.right, d.width), CenterBounds(ir.top, ir.bottom, this->cargo_icon_size.height));
@ -890,7 +890,7 @@ public:
bool stockpiling = HasBit(ind->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HasBit(ind->callback_mask, CBM_IND_PRODUCTION_256_TICKS); bool stockpiling = HasBit(ind->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HasBit(ind->callback_mask, CBM_IND_PRODUCTION_256_TICKS);
for (const auto &a : i->accepted) { for (const auto &a : i->accepted) {
if (!IsValidCargoID(a.cargo)) continue; if (!IsValidCargoType(a.cargo)) continue;
has_accept = true; has_accept = true;
if (first) { if (first) {
DrawString(ir, STR_INDUSTRY_VIEW_REQUIRES); DrawString(ir, STR_INDUSTRY_VIEW_REQUIRES);
@ -935,7 +935,7 @@ public:
int button_y_offset = (line_height - SETTING_BUTTON_HEIGHT) / 2; int button_y_offset = (line_height - SETTING_BUTTON_HEIGHT) / 2;
first = true; first = true;
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoType(p.cargo)) continue;
if (first) { if (first) {
if (has_accept) ir.top += WidgetDimensions::scaled.vsep_wide; if (has_accept) ir.top += WidgetDimensions::scaled.vsep_wide;
DrawString(ir, TimerGameEconomy::UsingWallclockUnits() ? STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE : STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE); DrawString(ir, TimerGameEconomy::UsingWallclockUnits() ? STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE : STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE);
@ -1036,7 +1036,7 @@ public:
if (pt.y >= this->production_offset_y) { if (pt.y >= this->production_offset_y) {
int row = (pt.y - this->production_offset_y) / this->cheat_line_height; int row = (pt.y - this->production_offset_y) / this->cheat_line_height;
for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) { for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) {
if (!IsValidCargoID(itp->cargo)) continue; if (!IsValidCargoType(itp->cargo)) continue;
row--; row--;
if (row < 0) { if (row < 0) {
line = (InfoLine)(IL_RATE1 + (itp - std::begin(i->produced))); line = (InfoLine)(IL_RATE1 + (itp - std::begin(i->produced)));
@ -1206,7 +1206,7 @@ static void UpdateIndustryProduction(Industry *i)
if (indspec->UsesOriginalEconomy()) i->RecomputeProductionMultipliers(); if (indspec->UsesOriginalEconomy()) i->RecomputeProductionMultipliers();
for (auto &p : i->produced) { for (auto &p : i->produced) {
if (IsValidCargoID(p.cargo)) { if (IsValidCargoType(p.cargo)) {
p.history[LAST_MONTH].production = ScaleByCargoScale(8 * p.rate, false); p.history[LAST_MONTH].production = ScaleByCargoScale(8 * p.rate, false);
} }
} }
@ -1282,7 +1282,7 @@ static constexpr NWidgetPart _nested_industry_directory_widgets[] = {
EndContainer(), EndContainer(),
}; };
typedef GUIList<const Industry *, const CargoID &, const std::pair<CargoID, CargoID> &> GUIIndustryList; typedef GUIList<const Industry *, const CargoType &, const std::pair<CargoType, CargoType> &> GUIIndustryList;
/** Cargo filter functions */ /** Cargo filter functions */
/** /**
@ -1291,7 +1291,7 @@ typedef GUIList<const Industry *, const CargoID &, const std::pair<CargoID, Carg
* @param cargoes The accepted and produced cargo pair to look for. * @param cargoes The accepted and produced cargo pair to look for.
* @return bool Whether the given cargoes accepted and produced by the industry. * @return bool Whether the given cargoes accepted and produced by the industry.
*/ */
static bool CargoFilter(const Industry * const *industry, const std::pair<CargoID, CargoID> &cargoes) static bool CargoFilter(const Industry * const *industry, const std::pair<CargoType, CargoType> &cargoes)
{ {
auto accepted_cargo = cargoes.first; auto accepted_cargo = cargoes.first;
auto produced_cargo = cargoes.second; auto produced_cargo = cargoes.second;
@ -1358,9 +1358,9 @@ protected:
Scrollbar *vscroll; Scrollbar *vscroll;
Scrollbar *hscroll; Scrollbar *hscroll;
CargoID produced_cargo_filter_criteria; ///< Selected produced cargo filter index CargoType produced_cargo_filter_criteria; ///< Selected produced cargo filter index
CargoID accepted_cargo_filter_criteria; ///< Selected accepted cargo filter index CargoType accepted_cargo_filter_criteria; ///< Selected accepted cargo filter index
static CargoID produced_cargo_filter; static CargoType produced_cargo_filter;
const int MAX_FILTER_LENGTH = 16; ///< The max length of the filter, in chars const int MAX_FILTER_LENGTH = 16; ///< The max length of the filter, in chars
StringFilter string_filter; ///< Filter for industries StringFilter string_filter; ///< Filter for industries
@ -1375,12 +1375,12 @@ protected:
/** /**
* Set produced cargo filter for the industry list. * Set produced cargo filter for the industry list.
* @param cid The cargo to be set * @param cargo_type The cargo to be set
*/ */
void SetProducedCargoFilter(CargoID cid) void SetProducedCargoFilter(CargoType cargo_type)
{ {
if (this->produced_cargo_filter_criteria != cid) { if (this->produced_cargo_filter_criteria != cargo_type) {
this->produced_cargo_filter_criteria = cid; this->produced_cargo_filter_criteria = cargo_type;
/* deactivate filter if criteria is 'Show All', activate it otherwise */ /* deactivate filter if criteria is 'Show All', activate it otherwise */
bool is_filtering_necessary = this->produced_cargo_filter_criteria != CargoFilterCriteria::CF_ANY || this->accepted_cargo_filter_criteria != CargoFilterCriteria::CF_ANY; bool is_filtering_necessary = this->produced_cargo_filter_criteria != CargoFilterCriteria::CF_ANY || this->accepted_cargo_filter_criteria != CargoFilterCriteria::CF_ANY;
@ -1394,10 +1394,10 @@ protected:
* Set accepted cargo filter for the industry list. * Set accepted cargo filter for the industry list.
* @param index The cargo to be set * @param index The cargo to be set
*/ */
void SetAcceptedCargoFilter(CargoID cid) void SetAcceptedCargoFilter(CargoType cargo_type)
{ {
if (this->accepted_cargo_filter_criteria != cid) { if (this->accepted_cargo_filter_criteria != cargo_type) {
this->accepted_cargo_filter_criteria = cid; this->accepted_cargo_filter_criteria = cargo_type;
/* deactivate filter if criteria is 'Show All', activate it otherwise */ /* deactivate filter if criteria is 'Show All', activate it otherwise */
bool is_filtering_necessary = this->produced_cargo_filter_criteria != CargoFilterCriteria::CF_ANY || this->accepted_cargo_filter_criteria != CargoFilterCriteria::CF_ANY; bool is_filtering_necessary = this->produced_cargo_filter_criteria != CargoFilterCriteria::CF_ANY || this->accepted_cargo_filter_criteria != CargoFilterCriteria::CF_ANY;
@ -1407,12 +1407,12 @@ protected:
} }
} }
StringID GetCargoFilterLabel(CargoID cid) const StringID GetCargoFilterLabel(CargoType cargo_type) const
{ {
switch (cid) { switch (cargo_type) {
case CargoFilterCriteria::CF_ANY: return STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES; case CargoFilterCriteria::CF_ANY: return STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES;
case CargoFilterCriteria::CF_NONE: return STR_INDUSTRY_DIRECTORY_FILTER_NONE; case CargoFilterCriteria::CF_NONE: return STR_INDUSTRY_DIRECTORY_FILTER_NONE;
default: return CargoSpec::Get(cid)->name; default: return CargoSpec::Get(cargo_type)->name;
} }
} }
@ -1485,7 +1485,7 @@ protected:
*/ */
static inline int GetCargoTransportedPercentsIfValid(const Industry::ProducedCargo &p) static inline int GetCargoTransportedPercentsIfValid(const Industry::ProducedCargo &p)
{ {
if (!IsValidCargoID(p.cargo)) return -1; if (!IsValidCargoType(p.cargo)) return -1;
return ToPercent8(p.history[LAST_MONTH].PctTransported()); return ToPercent8(p.history[LAST_MONTH].PctTransported());
} }
@ -1498,7 +1498,7 @@ protected:
*/ */
static int GetCargoTransportedSortValue(const Industry *i) static int GetCargoTransportedSortValue(const Industry *i)
{ {
CargoID filter = IndustryDirectoryWindow::produced_cargo_filter; CargoType filter = IndustryDirectoryWindow::produced_cargo_filter;
if (filter == CargoFilterCriteria::CF_NONE) return 0; if (filter == CargoFilterCriteria::CF_NONE) return 0;
int percentage = 0, produced_cargo_count = 0; int percentage = 0, produced_cargo_count = 0;
@ -1522,7 +1522,7 @@ protected:
} }
/** Sort industries by name */ /** Sort industries by name */
static bool IndustryNameSorter(const Industry * const &a, const Industry * const &b, const CargoID &) static bool IndustryNameSorter(const Industry * const &a, const Industry * const &b, const CargoType &)
{ {
int r = StrNaturalCompare(a->GetCachedName(), b->GetCachedName()); // Sort by name (natural sorting). int r = StrNaturalCompare(a->GetCachedName(), b->GetCachedName()); // Sort by name (natural sorting).
if (r == 0) return a->index < b->index; if (r == 0) return a->index < b->index;
@ -1530,7 +1530,7 @@ protected:
} }
/** Sort industries by type and name */ /** Sort industries by type and name */
static bool IndustryTypeSorter(const Industry * const &a, const Industry * const &b, const CargoID &filter) static bool IndustryTypeSorter(const Industry * const &a, const Industry * const &b, const CargoType &filter)
{ {
int it_a = 0; int it_a = 0;
while (it_a != NUM_INDUSTRYTYPES && a->type != _sorted_industry_types[it_a]) it_a++; while (it_a != NUM_INDUSTRYTYPES && a->type != _sorted_industry_types[it_a]) it_a++;
@ -1541,17 +1541,17 @@ protected:
} }
/** Sort industries by production and name */ /** Sort industries by production and name */
static bool IndustryProductionSorter(const Industry * const &a, const Industry * const &b, const CargoID &filter) static bool IndustryProductionSorter(const Industry * const &a, const Industry * const &b, const CargoType &filter)
{ {
if (filter == CargoFilterCriteria::CF_NONE) return IndustryTypeSorter(a, b, filter); if (filter == CargoFilterCriteria::CF_NONE) return IndustryTypeSorter(a, b, filter);
uint prod_a = 0, prod_b = 0; uint prod_a = 0, prod_b = 0;
if (filter == CargoFilterCriteria::CF_ANY) { if (filter == CargoFilterCriteria::CF_ANY) {
for (const auto &pa : a->produced) { for (const auto &pa : a->produced) {
if (IsValidCargoID(pa.cargo)) prod_a += pa.history[LAST_MONTH].production; if (IsValidCargoType(pa.cargo)) prod_a += pa.history[LAST_MONTH].production;
} }
for (const auto &pb : b->produced) { for (const auto &pb : b->produced) {
if (IsValidCargoID(pb.cargo)) prod_b += pb.history[LAST_MONTH].production; if (IsValidCargoType(pb.cargo)) prod_b += pb.history[LAST_MONTH].production;
} }
} else { } else {
if (auto ita = a->GetCargoProduced(filter); ita != std::end(a->produced)) prod_a = ita->history[LAST_MONTH].production; if (auto ita = a->GetCargoProduced(filter); ita != std::end(a->produced)) prod_a = ita->history[LAST_MONTH].production;
@ -1563,7 +1563,7 @@ protected:
} }
/** Sort industries by transported cargo and name */ /** Sort industries by transported cargo and name */
static bool IndustryTransportedCargoSorter(const Industry * const &a, const Industry * const &b, const CargoID &filter) static bool IndustryTransportedCargoSorter(const Industry * const &a, const Industry * const &b, const CargoType &filter)
{ {
int r = GetCargoTransportedSortValue(a) - GetCargoTransportedSortValue(b); int r = GetCargoTransportedSortValue(a) - GetCargoTransportedSortValue(b);
return (r == 0) ? IndustryNameSorter(a, b, filter) : r < 0; return (r == 0) ? IndustryNameSorter(a, b, filter) : r < 0;
@ -1582,19 +1582,19 @@ protected:
/* Industry name */ /* Industry name */
SetDParam(p++, i->index); SetDParam(p++, i->index);
/* Get industry productions (CargoID, production, suffix, transported) */ /* Get industry productions (CargoType, production, suffix, transported) */
struct CargoInfo { struct CargoInfo {
CargoID cargo_id; ///< Cargo ID. CargoType cargo_type; ///< Cargo type.
uint16_t production; ///< Production last month. uint16_t production; ///< Production last month.
uint transported; ///< Percent transported last month. uint transported; ///< Percent transported last month.
std::string suffix; ///< Cargo suffix. std::string suffix; ///< Cargo suffix.
CargoInfo(CargoID cargo_id, uint16_t production, uint transported, std::string &&suffix) : cargo_id(cargo_id), production(production), transported(transported), suffix(std::move(suffix)) {} CargoInfo(CargoType cargo_type, uint16_t production, uint transported, std::string &&suffix) : cargo_type(cargo_type), production(production), transported(transported), suffix(std::move(suffix)) {}
}; };
std::vector<CargoInfo> cargos; std::vector<CargoInfo> cargos;
for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) { for (auto itp = std::begin(i->produced); itp != std::end(i->produced); ++itp) {
if (!IsValidCargoID(itp->cargo)) continue; if (!IsValidCargoType(itp->cargo)) continue;
CargoSuffix cargo_suffix; CargoSuffix cargo_suffix;
GetCargoSuffix(CARGOSUFFIX_OUT, CST_DIR, i, i->type, indsp, itp->cargo, itp - std::begin(i->produced), cargo_suffix); GetCargoSuffix(CARGOSUFFIX_OUT, CST_DIR, i, i->type, indsp, itp->cargo, itp - std::begin(i->produced), cargo_suffix);
cargos.emplace_back(itp->cargo, itp->history[LAST_MONTH].production, ToPercent8(itp->history[LAST_MONTH].PctTransported()), std::move(cargo_suffix.text)); cargos.emplace_back(itp->cargo, itp->history[LAST_MONTH].production, ToPercent8(itp->history[LAST_MONTH].PctTransported()), std::move(cargo_suffix.text));
@ -1622,9 +1622,9 @@ protected:
/* If the produced cargo filter is active then move the filtered cargo to the beginning of the list, /* If the produced cargo filter is active then move the filtered cargo to the beginning of the list,
* because this is the one the player interested in, and that way it is not hidden in the 'n' more cargos */ * because this is the one the player interested in, and that way it is not hidden in the 'n' more cargos */
const CargoID cid = this->produced_cargo_filter_criteria; const CargoType cargo_type = this->produced_cargo_filter_criteria;
if (cid != CargoFilterCriteria::CF_ANY && cid != CargoFilterCriteria::CF_NONE) { if (cargo_type != CargoFilterCriteria::CF_ANY && cargo_type != CargoFilterCriteria::CF_NONE) {
auto filtered_ci = std::ranges::find(cargos, cid, &CargoInfo::cargo_id); auto filtered_ci = std::ranges::find(cargos, cargo_type, &CargoInfo::cargo_type);
if (filtered_ci != cargos.end()) { if (filtered_ci != cargos.end()) {
std::rotate(cargos.begin(), filtered_ci, filtered_ci + 1); std::rotate(cargos.begin(), filtered_ci, filtered_ci + 1);
} }
@ -1634,7 +1634,7 @@ protected:
for (size_t j = 0; j < std::min<size_t>(3, cargos.size()); j++) { for (size_t j = 0; j < std::min<size_t>(3, cargos.size()); j++) {
CargoInfo &ci = cargos[j]; CargoInfo &ci = cargos[j];
SetDParam(p++, STR_INDUSTRY_DIRECTORY_ITEM_INFO); SetDParam(p++, STR_INDUSTRY_DIRECTORY_ITEM_INFO);
SetDParam(p++, ci.cargo_id); SetDParam(p++, ci.cargo_type);
SetDParam(p++, ci.production); SetDParam(p++, ci.production);
SetDParamStr(p++, std::move(ci.suffix)); SetDParamStr(p++, std::move(ci.suffix));
SetDParam(p++, ci.transported); SetDParam(p++, ci.transported);
@ -1730,13 +1730,13 @@ public:
DrawString(ir, STR_INDUSTRY_DIRECTORY_NONE); DrawString(ir, STR_INDUSTRY_DIRECTORY_NONE);
break; break;
} }
const CargoID acf_cid = this->accepted_cargo_filter_criteria; const CargoType acf_cargo_type = this->accepted_cargo_filter_criteria;
auto [first, last] = this->vscroll->GetVisibleRangeIterators(this->industries); auto [first, last] = this->vscroll->GetVisibleRangeIterators(this->industries);
for (auto it = first; it != last; ++it) { for (auto it = first; it != last; ++it) {
TextColour tc = TC_FROMSTRING; TextColour tc = TC_FROMSTRING;
if (acf_cid != CargoFilterCriteria::CF_ANY && acf_cid != CargoFilterCriteria::CF_NONE) { if (acf_cargo_type != CargoFilterCriteria::CF_ANY && acf_cargo_type != CargoFilterCriteria::CF_NONE) {
Industry *ind = const_cast<Industry *>(*it); Industry *ind = const_cast<Industry *>(*it);
if (IndustryTemporarilyRefusesCargo(ind, acf_cid)) { if (IndustryTemporarilyRefusesCargo(ind, acf_cargo_type)) {
tc = TC_GREY | TC_FORCED; tc = TC_GREY | TC_FORCED;
} }
} }
@ -1935,7 +1935,7 @@ const std::initializer_list<GUIIndustryList::SortFunction * const> IndustryDirec
&IndustryTransportedCargoSorter &IndustryTransportedCargoSorter
}; };
CargoID IndustryDirectoryWindow::produced_cargo_filter = CargoFilterCriteria::CF_ANY; CargoType IndustryDirectoryWindow::produced_cargo_filter = CargoFilterCriteria::CF_ANY;
/** Window definition of the industry directory gui */ /** Window definition of the industry directory gui */
@ -2023,11 +2023,11 @@ struct CargoesField {
union { union {
struct { struct {
IndustryType ind_type; ///< Industry type (#NUM_INDUSTRYTYPES means 'houses'). IndustryType ind_type; ///< Industry type (#NUM_INDUSTRYTYPES means 'houses').
CargoID other_produced[MAX_CARGOES]; ///< Cargoes produced but not used in this figure. CargoType other_produced[MAX_CARGOES]; ///< Cargoes produced but not used in this figure.
CargoID other_accepted[MAX_CARGOES]; ///< Cargoes accepted but not used in this figure. CargoType other_accepted[MAX_CARGOES]; ///< Cargoes accepted but not used in this figure.
} industry; ///< Industry data (for #CFT_INDUSTRY). } industry; ///< Industry data (for #CFT_INDUSTRY).
struct { struct {
CargoID vertical_cargoes[MAX_CARGOES]; ///< Cargoes running from top to bottom (cargo ID or #INVALID_CARGO). CargoType vertical_cargoes[MAX_CARGOES]; ///< Cargoes running from top to bottom (cargo type or #INVALID_CARGO).
Cargoes supp_cargoes; ///< Cargoes in \c vertical_cargoes entering from the left. Cargoes supp_cargoes; ///< Cargoes in \c vertical_cargoes entering from the left.
Cargoes cust_cargoes; ///< Cargoes in \c vertical_cargoes leaving to the right. Cargoes cust_cargoes; ///< Cargoes in \c vertical_cargoes leaving to the right.
uint8_t num_cargoes; ///< Number of cargoes. uint8_t num_cargoes; ///< Number of cargoes.
@ -2035,7 +2035,7 @@ struct CargoesField {
uint8_t bottom_end; ///< Stop at the bottom of the vertical cargoes. uint8_t bottom_end; ///< Stop at the bottom of the vertical cargoes.
} cargo; ///< Cargo data (for #CFT_CARGO). } cargo; ///< Cargo data (for #CFT_CARGO).
struct { struct {
CargoID cargoes[MAX_CARGOES]; ///< Cargoes to display (or #INVALID_CARGO). CargoType cargoes[MAX_CARGOES]; ///< Cargoes to display (or #INVALID_CARGO).
bool left_align; ///< Align all cargo texts to the left (else align to the right). bool left_align; ///< Align all cargo texts to the left (else align to the right).
} cargo_label; ///< Label data (for #CFT_CARGO_LABEL). } cargo_label; ///< Label data (for #CFT_CARGO_LABEL).
StringID header; ///< Header text (for #CFT_HEADER). StringID header; ///< Header text (for #CFT_HEADER).
@ -2069,10 +2069,10 @@ struct CargoesField {
* @param producer Cargo is produced (if \c false, cargo is assumed to be accepted). * @param producer Cargo is produced (if \c false, cargo is assumed to be accepted).
* @return Horizontal connection index, or \c -1 if not accepted at all. * @return Horizontal connection index, or \c -1 if not accepted at all.
*/ */
int ConnectCargo(CargoID cargo, bool producer) int ConnectCargo(CargoType cargo, bool producer)
{ {
assert(this->type == CFT_CARGO); assert(this->type == CFT_CARGO);
if (!IsValidCargoID(cargo)) return -1; if (!IsValidCargoType(cargo)) return -1;
/* Find the vertical cargo column carrying the cargo. */ /* Find the vertical cargo column carrying the cargo. */
int column = -1; int column = -1;
@ -2107,16 +2107,16 @@ struct CargoesField {
/** /**
* Make a piece of cargo column. * Make a piece of cargo column.
* @param cargoes Span of #CargoID (may contain #INVALID_CARGO). * @param cargoes Span of #CargoType (may contain #INVALID_CARGO).
* @note #supp_cargoes and #cust_cargoes should be filled in later. * @note #supp_cargoes and #cust_cargoes should be filled in later.
*/ */
void MakeCargo(const std::span<const CargoID> cargoes) void MakeCargo(const std::span<const CargoType> cargoes)
{ {
this->type = CFT_CARGO; this->type = CFT_CARGO;
assert(std::size(cargoes) <= std::size(this->u.cargo.vertical_cargoes)); assert(std::size(cargoes) <= std::size(this->u.cargo.vertical_cargoes));
auto insert = std::copy_if(std::begin(cargoes), std::end(cargoes), std::begin(this->u.cargo.vertical_cargoes), IsValidCargoID); auto insert = std::copy_if(std::begin(cargoes), std::end(cargoes), std::begin(this->u.cargo.vertical_cargoes), IsValidCargoType);
this->u.cargo.num_cargoes = static_cast<uint8_t>(std::distance(std::begin(this->u.cargo.vertical_cargoes), insert)); this->u.cargo.num_cargoes = static_cast<uint8_t>(std::distance(std::begin(this->u.cargo.vertical_cargoes), insert));
CargoIDComparator comparator; CargoTypeComparator comparator;
std::sort(std::begin(this->u.cargo.vertical_cargoes), insert, comparator); std::sort(std::begin(this->u.cargo.vertical_cargoes), insert, comparator);
std::fill(insert, std::end(this->u.cargo.vertical_cargoes), INVALID_CARGO); std::fill(insert, std::end(this->u.cargo.vertical_cargoes), INVALID_CARGO);
this->u.cargo.top_end = false; this->u.cargo.top_end = false;
@ -2127,10 +2127,10 @@ struct CargoesField {
/** /**
* Make a field displaying cargo type names. * Make a field displaying cargo type names.
* @param cargoes Span of #CargoID (may contain #INVALID_CARGO). * @param cargoes Span of #CargoType (may contain #INVALID_CARGO).
* @param left_align ALign texts to the left (else to the right). * @param left_align ALign texts to the left (else to the right).
*/ */
void MakeCargoLabel(const std::span<const CargoID> cargoes, bool left_align) void MakeCargoLabel(const std::span<const CargoType> cargoes, bool left_align)
{ {
this->type = CFT_CARGO_LABEL; this->type = CFT_CARGO_LABEL;
assert(std::size(cargoes) <= std::size(this->u.cargo_label.cargoes)); assert(std::size(cargoes) <= std::size(this->u.cargo_label.cargoes));
@ -2205,7 +2205,7 @@ struct CargoesField {
} }
/* Draw the other_produced/other_accepted cargoes. */ /* Draw the other_produced/other_accepted cargoes. */
std::span<const CargoID> other_right, other_left; std::span<const CargoType> other_right, other_left;
if (_current_text_dir == TD_RTL) { if (_current_text_dir == TD_RTL) {
other_right = this->u.industry.other_accepted; other_right = this->u.industry.other_accepted;
other_left = this->u.industry.other_produced; other_left = this->u.industry.other_produced;
@ -2215,13 +2215,13 @@ struct CargoesField {
} }
ypos1 += CargoesField::cargo_border.height + (GetCharacterHeight(FS_NORMAL) - CargoesField::cargo_line.height) / 2; ypos1 += CargoesField::cargo_border.height + (GetCharacterHeight(FS_NORMAL) - CargoesField::cargo_line.height) / 2;
for (uint i = 0; i < CargoesField::max_cargoes; i++) { for (uint i = 0; i < CargoesField::max_cargoes; i++) {
if (IsValidCargoID(other_right[i])) { if (IsValidCargoType(other_right[i])) {
const CargoSpec *csp = CargoSpec::Get(other_right[i]); const CargoSpec *csp = CargoSpec::Get(other_right[i]);
int xp = xpos + industry_width + CargoesField::cargo_stub.width; int xp = xpos + industry_width + CargoesField::cargo_stub.width;
DrawHorConnection(xpos + industry_width, xp - 1, ypos1, csp); DrawHorConnection(xpos + industry_width, xp - 1, ypos1, csp);
GfxDrawLine(xp, ypos1, xp, ypos1 + CargoesField::cargo_line.height - 1, CARGO_LINE_COLOUR); GfxDrawLine(xp, ypos1, xp, ypos1 + CargoesField::cargo_line.height - 1, CARGO_LINE_COLOUR);
} }
if (IsValidCargoID(other_left[i])) { if (IsValidCargoType(other_left[i])) {
const CargoSpec *csp = CargoSpec::Get(other_left[i]); const CargoSpec *csp = CargoSpec::Get(other_left[i]);
int xp = xpos - CargoesField::cargo_stub.width; int xp = xpos - CargoesField::cargo_stub.width;
DrawHorConnection(xp + 1, xpos - 1, ypos1, csp); DrawHorConnection(xp + 1, xpos - 1, ypos1, csp);
@ -2289,7 +2289,7 @@ struct CargoesField {
case CFT_CARGO_LABEL: case CFT_CARGO_LABEL:
ypos += CargoesField::cargo_border.height + vert_inter_industry_space / 2; ypos += CargoesField::cargo_border.height + vert_inter_industry_space / 2;
for (uint i = 0; i < MAX_CARGOES; i++) { for (uint i = 0; i < MAX_CARGOES; i++) {
if (IsValidCargoID(this->u.cargo_label.cargoes[i])) { if (IsValidCargoType(this->u.cargo_label.cargoes[i])) {
const CargoSpec *csp = CargoSpec::Get(this->u.cargo_label.cargoes[i]); const CargoSpec *csp = CargoSpec::Get(this->u.cargo_label.cargoes[i]);
DrawString(xpos + WidgetDimensions::scaled.framerect.left, xpos + industry_width - 1 - WidgetDimensions::scaled.framerect.right, ypos, csp->name, TC_WHITE, DrawString(xpos + WidgetDimensions::scaled.framerect.left, xpos + industry_width - 1 - WidgetDimensions::scaled.framerect.right, ypos, csp->name, TC_WHITE,
(this->u.cargo_label.left_align) ? SA_LEFT : SA_RIGHT); (this->u.cargo_label.left_align) ? SA_LEFT : SA_RIGHT);
@ -2310,7 +2310,7 @@ struct CargoesField {
* @param pt Click position in the cargo field. * @param pt Click position in the cargo field.
* @return Cargo clicked at, or #INVALID_CARGO if none. * @return Cargo clicked at, or #INVALID_CARGO if none.
*/ */
CargoID CargoClickedAt(const CargoesField *left, const CargoesField *right, Point pt) const CargoType CargoClickedAt(const CargoesField *left, const CargoesField *right, Point pt) const
{ {
assert(this->type == CFT_CARGO); assert(this->type == CFT_CARGO);
@ -2368,7 +2368,7 @@ struct CargoesField {
* @param pt Click position in the cargo label field. * @param pt Click position in the cargo label field.
* @return Cargo clicked at, or #INVALID_CARGO if none. * @return Cargo clicked at, or #INVALID_CARGO if none.
*/ */
CargoID CargoLabelClickedAt(Point pt) const CargoType CargoLabelClickedAt(Point pt) const
{ {
assert(this->type == CFT_CARGO_LABEL); assert(this->type == CFT_CARGO_LABEL);
@ -2437,7 +2437,7 @@ struct CargoesRow {
std::fill(std::begin(ind_fld->u.industry.other_produced), std::end(ind_fld->u.industry.other_produced), INVALID_CARGO); std::fill(std::begin(ind_fld->u.industry.other_produced), std::end(ind_fld->u.industry.other_produced), INVALID_CARGO);
if (ind_fld->u.industry.ind_type < NUM_INDUSTRYTYPES) { if (ind_fld->u.industry.ind_type < NUM_INDUSTRYTYPES) {
CargoID others[MAX_CARGOES]; // Produced cargoes not carried in the cargo column. CargoType others[MAX_CARGOES]; // Produced cargoes not carried in the cargo column.
int other_count = 0; int other_count = 0;
const IndustrySpec *indsp = GetIndustrySpec(ind_fld->u.industry.ind_type); const IndustrySpec *indsp = GetIndustrySpec(ind_fld->u.industry.ind_type);
@ -2454,9 +2454,9 @@ struct CargoesRow {
} else { } else {
/* Houses only display cargo that towns produce. */ /* Houses only display cargo that towns produce. */
for (uint i = 0; i < cargo_fld->u.cargo.num_cargoes; i++) { for (uint i = 0; i < cargo_fld->u.cargo.num_cargoes; i++) {
CargoID cid = cargo_fld->u.cargo.vertical_cargoes[i]; CargoType cargo_type = cargo_fld->u.cargo.vertical_cargoes[i];
TownProductionEffect tpe = CargoSpec::Get(cid)->town_production_effect; TownProductionEffect tpe = CargoSpec::Get(cargo_type)->town_production_effect;
if (tpe == TPE_PASSENGERS || tpe == TPE_MAIL) cargo_fld->ConnectCargo(cid, true); if (tpe == TPE_PASSENGERS || tpe == TPE_MAIL) cargo_fld->ConnectCargo(cargo_type, true);
} }
} }
} }
@ -2468,7 +2468,7 @@ struct CargoesRow {
*/ */
void MakeCargoLabel(int column, bool accepting) void MakeCargoLabel(int column, bool accepting)
{ {
CargoID cargoes[MAX_CARGOES]; CargoType cargoes[MAX_CARGOES];
std::fill(std::begin(cargoes), std::end(cargoes), INVALID_CARGO); std::fill(std::begin(cargoes), std::end(cargoes), INVALID_CARGO);
CargoesField *label_fld = this->columns + column; CargoesField *label_fld = this->columns + column;
@ -2496,7 +2496,7 @@ struct CargoesRow {
std::fill(std::begin(ind_fld->u.industry.other_accepted), std::end(ind_fld->u.industry.other_accepted), INVALID_CARGO); std::fill(std::begin(ind_fld->u.industry.other_accepted), std::end(ind_fld->u.industry.other_accepted), INVALID_CARGO);
if (ind_fld->u.industry.ind_type < NUM_INDUSTRYTYPES) { if (ind_fld->u.industry.ind_type < NUM_INDUSTRYTYPES) {
CargoID others[MAX_CARGOES]; // Accepted cargoes not carried in the cargo column. CargoType others[MAX_CARGOES]; // Accepted cargoes not carried in the cargo column.
int other_count = 0; int other_count = 0;
const IndustrySpec *indsp = GetIndustrySpec(ind_fld->u.industry.ind_type); const IndustrySpec *indsp = GetIndustrySpec(ind_fld->u.industry.ind_type);
@ -2561,7 +2561,7 @@ struct IndustryCargoesWindow : public Window {
typedef std::vector<CargoesRow> Fields; typedef std::vector<CargoesRow> Fields;
Fields fields; ///< Fields to display in the #WID_IC_PANEL. Fields fields; ///< Fields to display in the #WID_IC_PANEL.
uint ind_cargo; ///< If less than #NUM_INDUSTRYTYPES, an industry type, else a cargo id + NUM_INDUSTRYTYPES. uint ind_cargo; ///< If less than #NUM_INDUSTRYTYPES, an industry type, else a cargo type + NUM_INDUSTRYTYPES.
Dimension cargo_textsize; ///< Size to hold any cargo text, as well as STR_INDUSTRY_CARGOES_SELECT_CARGO. Dimension cargo_textsize; ///< Size to hold any cargo text, as well as STR_INDUSTRY_CARGOES_SELECT_CARGO.
Dimension ind_textsize; ///< Size to hold any industry type text, as well as STR_INDUSTRY_CARGOES_SELECT_INDUSTRY. Dimension ind_textsize; ///< Size to hold any industry type text, as well as STR_INDUSTRY_CARGOES_SELECT_INDUSTRY.
Scrollbar *vscroll; Scrollbar *vscroll;
@ -2615,8 +2615,8 @@ struct IndustryCargoesWindow : public Window {
const IndustrySpec *indsp = GetIndustrySpec(it); const IndustrySpec *indsp = GetIndustrySpec(it);
if (!indsp->enabled) continue; if (!indsp->enabled) continue;
this->ind_textsize = maxdim(this->ind_textsize, GetStringBoundingBox(indsp->name)); this->ind_textsize = maxdim(this->ind_textsize, GetStringBoundingBox(indsp->name));
CargoesField::max_cargoes = std::max<uint>(CargoesField::max_cargoes, std::ranges::count_if(indsp->accepts_cargo, IsValidCargoID)); CargoesField::max_cargoes = std::max<uint>(CargoesField::max_cargoes, std::ranges::count_if(indsp->accepts_cargo, IsValidCargoType));
CargoesField::max_cargoes = std::max<uint>(CargoesField::max_cargoes, std::ranges::count_if(indsp->produced_cargo, IsValidCargoID)); CargoesField::max_cargoes = std::max<uint>(CargoesField::max_cargoes, std::ranges::count_if(indsp->produced_cargo, IsValidCargoType));
} }
d.width = std::max(d.width, this->ind_textsize.width); d.width = std::max(d.width, this->ind_textsize.width);
d.height = this->ind_textsize.height; d.height = this->ind_textsize.height;
@ -2682,12 +2682,12 @@ struct IndustryCargoesWindow : public Window {
* @param cargoes2 Span of the second cargo list. * @param cargoes2 Span of the second cargo list.
* @return Arrays have at least one valid cargo in common. * @return Arrays have at least one valid cargo in common.
*/ */
static bool HasCommonValidCargo(const std::span<const CargoID> cargoes1, const std::span<const CargoID> cargoes2) static bool HasCommonValidCargo(const std::span<const CargoType> cargoes1, const std::span<const CargoType> cargoes2)
{ {
for (const CargoID cid1 : cargoes1) { for (const CargoType cargo_type1 : cargoes1) {
if (!IsValidCargoID(cid1)) continue; if (!IsValidCargoType(cargo_type1)) continue;
for (const CargoID cid2 : cargoes2) { for (const CargoType cargo_type2 : cargoes2) {
if (cid1 == cid2) return true; if (cargo_type1 == cargo_type2) return true;
} }
} }
return false; return false;
@ -2698,11 +2698,11 @@ struct IndustryCargoesWindow : public Window {
* @param cargoes Span of cargo list. * @param cargoes Span of cargo list.
* @return Houses can supply at least one of the cargoes. * @return Houses can supply at least one of the cargoes.
*/ */
static bool HousesCanSupply(const std::span<const CargoID> cargoes) static bool HousesCanSupply(const std::span<const CargoType> cargoes)
{ {
for (const CargoID cid : cargoes) { for (const CargoType cargo_type : cargoes) {
if (!IsValidCargoID(cid)) continue; if (!IsValidCargoType(cargo_type)) continue;
TownProductionEffect tpe = CargoSpec::Get(cid)->town_production_effect; TownProductionEffect tpe = CargoSpec::Get(cargo_type)->town_production_effect;
if (tpe == TPE_PASSENGERS || tpe == TPE_MAIL) return true; if (tpe == TPE_PASSENGERS || tpe == TPE_MAIL) return true;
} }
return false; return false;
@ -2713,7 +2713,7 @@ struct IndustryCargoesWindow : public Window {
* @param cargoes Span of cargo list. * @param cargoes Span of cargo list.
* @return Houses can accept at least one of the cargoes. * @return Houses can accept at least one of the cargoes.
*/ */
static bool HousesCanAccept(const std::span<const CargoID> cargoes) static bool HousesCanAccept(const std::span<const CargoType> cargoes)
{ {
HouseZones climate_mask; HouseZones climate_mask;
switch (_settings_game.game_creation.landscape) { switch (_settings_game.game_creation.landscape) {
@ -2723,14 +2723,14 @@ struct IndustryCargoesWindow : public Window {
case LT_TOYLAND: climate_mask = HZ_TOYLND; break; case LT_TOYLAND: climate_mask = HZ_TOYLND; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
for (const CargoID cid : cargoes) { for (const CargoType cargo_type : cargoes) {
if (!IsValidCargoID(cid)) continue; if (!IsValidCargoType(cargo_type)) continue;
for (const auto &hs : HouseSpec::Specs()) { for (const auto &hs : HouseSpec::Specs()) {
if (!hs.enabled || !(hs.building_availability & climate_mask)) continue; if (!hs.enabled || !(hs.building_availability & climate_mask)) continue;
for (uint j = 0; j < lengthof(hs.accepts_cargo); j++) { for (uint j = 0; j < lengthof(hs.accepts_cargo); j++) {
if (hs.cargo_acceptance[j] > 0 && cid == hs.accepts_cargo[j]) return true; if (hs.cargo_acceptance[j] > 0 && cargo_type == hs.accepts_cargo[j]) return true;
} }
} }
} }
@ -2742,7 +2742,7 @@ struct IndustryCargoesWindow : public Window {
* @param cargoes Cargoes to search. * @param cargoes Cargoes to search.
* @return Number of industries that have an accepted cargo in common with the supplied set. * @return Number of industries that have an accepted cargo in common with the supplied set.
*/ */
static int CountMatchingAcceptingIndustries(const std::span<const CargoID> cargoes) static int CountMatchingAcceptingIndustries(const std::span<const CargoType> cargoes)
{ {
int count = 0; int count = 0;
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) { for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
@ -2759,7 +2759,7 @@ struct IndustryCargoesWindow : public Window {
* @param cargoes Cargoes to search. * @param cargoes Cargoes to search.
* @return Number of industries that have a produced cargo in common with the supplied set. * @return Number of industries that have a produced cargo in common with the supplied set.
*/ */
static int CountMatchingProducingIndustries(const std::span<const CargoID> cargoes) static int CountMatchingProducingIndustries(const std::span<const CargoType> cargoes)
{ {
int count = 0; int count = 0;
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) { for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
@ -2900,13 +2900,13 @@ struct IndustryCargoesWindow : public Window {
} }
/** /**
* Compute what and where to display for cargo id \a cid. * Compute what and where to display for cargo type \a cargo_type.
* @param cid Cargo id to display. * @param cargo_type Cargo type to display.
*/ */
void ComputeCargoDisplay(CargoID cid) void ComputeCargoDisplay(CargoType cargo_type)
{ {
this->GetWidget<NWidgetCore>(WID_IC_CAPTION)->SetString(STR_INDUSTRY_CARGOES_CARGO_CAPTION); this->GetWidget<NWidgetCore>(WID_IC_CAPTION)->SetString(STR_INDUSTRY_CARGOES_CARGO_CAPTION);
this->ind_cargo = cid + NUM_INDUSTRYTYPES; this->ind_cargo = cargo_type + NUM_INDUSTRYTYPES;
_displayed_industries.reset(); _displayed_industries.reset();
this->fields.clear(); this->fields.clear();
@ -2917,7 +2917,7 @@ struct IndustryCargoesWindow : public Window {
first_row.columns[3].MakeEmpty(CFT_SMALL_EMPTY); first_row.columns[3].MakeEmpty(CFT_SMALL_EMPTY);
first_row.columns[4].MakeEmpty(CFT_SMALL_EMPTY); first_row.columns[4].MakeEmpty(CFT_SMALL_EMPTY);
auto cargoes = std::span(&cid, 1); auto cargoes = std::span(&cargo_type, 1);
bool houses_supply = HousesCanSupply(cargoes); bool houses_supply = HousesCanSupply(cargoes);
bool houses_accept = HousesCanAccept(cargoes); bool houses_accept = HousesCanAccept(cargoes);
int num_supp = CountMatchingProducingIndustries(cargoes) + houses_supply + 1; // Ensure room for the cargo label. int num_supp = CountMatchingProducingIndustries(cargoes) + houses_supply + 1; // Ensure room for the cargo label.
@ -3087,14 +3087,14 @@ struct IndustryCargoesWindow : public Window {
case CFT_CARGO: { case CFT_CARGO: {
CargoesField *lft = (fieldxy.x > 0) ? this->fields[fieldxy.y].columns + fieldxy.x - 1 : nullptr; CargoesField *lft = (fieldxy.x > 0) ? this->fields[fieldxy.y].columns + fieldxy.x - 1 : nullptr;
CargoesField *rgt = (fieldxy.x < 4) ? this->fields[fieldxy.y].columns + fieldxy.x + 1 : nullptr; CargoesField *rgt = (fieldxy.x < 4) ? this->fields[fieldxy.y].columns + fieldxy.x + 1 : nullptr;
CargoID cid = fld->CargoClickedAt(lft, rgt, xy); CargoType cargo_type = fld->CargoClickedAt(lft, rgt, xy);
if (IsValidCargoID(cid)) this->ComputeCargoDisplay(cid); if (IsValidCargoType(cargo_type)) this->ComputeCargoDisplay(cargo_type);
break; break;
} }
case CFT_CARGO_LABEL: { case CFT_CARGO_LABEL: {
CargoID cid = fld->CargoLabelClickedAt(xy); CargoType cargo_type = fld->CargoLabelClickedAt(xy);
if (IsValidCargoID(cid)) this->ComputeCargoDisplay(cid); if (IsValidCargoType(cargo_type)) this->ComputeCargoDisplay(cargo_type);
break; break;
} }
@ -3167,17 +3167,17 @@ struct IndustryCargoesWindow : public Window {
if (!CalculatePositionInWidget(pt, &fieldxy, &xy)) return false; if (!CalculatePositionInWidget(pt, &fieldxy, &xy)) return false;
const CargoesField *fld = this->fields[fieldxy.y].columns + fieldxy.x; const CargoesField *fld = this->fields[fieldxy.y].columns + fieldxy.x;
CargoID cid = INVALID_CARGO; CargoType cargo_type = INVALID_CARGO;
switch (fld->type) { switch (fld->type) {
case CFT_CARGO: { case CFT_CARGO: {
CargoesField *lft = (fieldxy.x > 0) ? this->fields[fieldxy.y].columns + fieldxy.x - 1 : nullptr; CargoesField *lft = (fieldxy.x > 0) ? this->fields[fieldxy.y].columns + fieldxy.x - 1 : nullptr;
CargoesField *rgt = (fieldxy.x < 4) ? this->fields[fieldxy.y].columns + fieldxy.x + 1 : nullptr; CargoesField *rgt = (fieldxy.x < 4) ? this->fields[fieldxy.y].columns + fieldxy.x + 1 : nullptr;
cid = fld->CargoClickedAt(lft, rgt, xy); cargo_type = fld->CargoClickedAt(lft, rgt, xy);
break; break;
} }
case CFT_CARGO_LABEL: { case CFT_CARGO_LABEL: {
cid = fld->CargoLabelClickedAt(xy); cargo_type = fld->CargoLabelClickedAt(xy);
break; break;
} }
@ -3190,8 +3190,8 @@ struct IndustryCargoesWindow : public Window {
default: default:
break; break;
} }
if (IsValidCargoID(cid) && (this->ind_cargo < NUM_INDUSTRYTYPES || cid != this->ind_cargo - NUM_INDUSTRYTYPES)) { if (IsValidCargoType(cargo_type) && (this->ind_cargo < NUM_INDUSTRYTYPES || cargo_type != this->ind_cargo - NUM_INDUSTRYTYPES)) {
const CargoSpec *csp = CargoSpec::Get(cid); const CargoSpec *csp = CargoSpec::Get(cargo_type);
SetDParam(0, csp->name); SetDParam(0, csp->name);
GuiShowTooltips(this, STR_INDUSTRY_CARGOES_CARGO_TOOLTIP, close_cond, 1); GuiShowTooltips(this, STR_INDUSTRY_CARGOES_CARGO_TOOLTIP, close_cond, 1);
return true; return true;

6
src/industrytype.h
View File

@ -105,14 +105,14 @@ struct IndustrySpec {
uint32_t prospecting_chance; ///< Chance prospecting succeeds uint32_t prospecting_chance; ///< Chance prospecting succeeds
IndustryType conflicting[3]; ///< Industries this industry cannot be close to IndustryType conflicting[3]; ///< Industries this industry cannot be close to
uint8_t check_proc; ///< Index to a procedure to check for conflicting circumstances uint8_t check_proc; ///< Index to a procedure to check for conflicting circumstances
std::array<CargoID, INDUSTRY_NUM_OUTPUTS> produced_cargo; std::array<CargoType, INDUSTRY_NUM_OUTPUTS> produced_cargo;
uint8_t production_rate[INDUSTRY_NUM_OUTPUTS]; uint8_t production_rate[INDUSTRY_NUM_OUTPUTS];
/** /**
* minimum amount of cargo transported to the stations. * minimum amount of cargo transported to the stations.
* If the waiting cargo is less than this number, no cargo is moved to it. * If the waiting cargo is less than this number, no cargo is moved to it.
*/ */
uint8_t minimal_cargo; uint8_t minimal_cargo;
std::array<CargoID, INDUSTRY_NUM_INPUTS> accepts_cargo; ///< 16 accepted cargoes. std::array<CargoType, INDUSTRY_NUM_INPUTS> accepts_cargo; ///< 16 accepted cargoes.
uint16_t input_cargo_multiplier[INDUSTRY_NUM_INPUTS][INDUSTRY_NUM_OUTPUTS]; ///< Input cargo multipliers (multiply amount of incoming cargo for the produced cargoes) uint16_t input_cargo_multiplier[INDUSTRY_NUM_INPUTS][INDUSTRY_NUM_OUTPUTS]; ///< Input cargo multipliers (multiply amount of incoming cargo for the produced cargoes)
IndustryLifeType life_type; ///< This is also known as Industry production flag, in newgrf specs IndustryLifeType life_type; ///< This is also known as Industry production flag, in newgrf specs
uint8_t climate_availability; ///< Bitmask, giving landscape enums as bit position uint8_t climate_availability; ///< Bitmask, giving landscape enums as bit position
@ -147,7 +147,7 @@ struct IndustrySpec {
* @note A tile can at most accept 3 types of cargo, even if an industry as a whole can accept more types. * @note A tile can at most accept 3 types of cargo, even if an industry as a whole can accept more types.
*/ */
struct IndustryTileSpec { struct IndustryTileSpec {
std::array<CargoID, INDUSTRY_NUM_INPUTS> accepts_cargo; ///< Cargo accepted by this tile std::array<CargoType, INDUSTRY_NUM_INPUTS> accepts_cargo; ///< Cargo accepted by this tile
std::array<int8_t, INDUSTRY_NUM_INPUTS> acceptance; ///< Level of acceptance per cargo type (signed, may be negative!) std::array<int8_t, INDUSTRY_NUM_INPUTS> acceptance; ///< Level of acceptance per cargo type (signed, may be negative!)
Slope slopes_refused; ///< slope pattern on which this tile cannot be built Slope slopes_refused; ///< slope pattern on which this tile cannot be built
uint8_t anim_production; ///< Animation frame to start when goods are produced uint8_t anim_production; ///< Animation frame to start when goods are produced

2
src/linkgraph/demands.cpp
View File

@ -263,7 +263,7 @@ DemandCalculator::DemandCalculator(LinkGraphJob &job) :
base_distance(IntSqrt(DistanceMaxPlusManhattan(TileXY(0,0), TileXY(Map::MaxX(), Map::MaxY())))) base_distance(IntSqrt(DistanceMaxPlusManhattan(TileXY(0,0), TileXY(Map::MaxX(), Map::MaxY()))))
{ {
const LinkGraphSettings &settings = job.Settings(); const LinkGraphSettings &settings = job.Settings();
CargoID cargo = job.Cargo(); CargoType cargo = job.Cargo();
this->accuracy = settings.accuracy; this->accuracy = settings.accuracy;
this->mod_dist = settings.demand_distance; this->mod_dist = settings.demand_distance;

10
src/linkgraph/linkgraph.h
View File

@ -194,7 +194,7 @@ public:
* Real constructor. * Real constructor.
* @param cargo Cargo the link graph is about. * @param cargo Cargo the link graph is about.
*/ */
LinkGraph(CargoID cargo) : cargo(cargo), last_compression(TimerGameEconomy::date) {} LinkGraph(CargoType cargo) : cargo(cargo), last_compression(TimerGameEconomy::date) {}
void Init(uint size); void Init(uint size);
void ShiftDates(TimerGameEconomy::Date interval); void ShiftDates(TimerGameEconomy::Date interval);
@ -236,10 +236,10 @@ public:
inline TimerGameEconomy::Date LastCompression() const { return this->last_compression; } inline TimerGameEconomy::Date LastCompression() const { return this->last_compression; }
/** /**
* Get the cargo ID this component's link graph refers to. * Get the cargo type this component's link graph refers to.
* @return Cargo ID. * @return Cargo type.
*/ */
inline CargoID Cargo() const { return this->cargo; } inline CargoType Cargo() const { return this->cargo; }
/** /**
* Scale a value to its monthly equivalent, based on last compression. * Scale a value to its monthly equivalent, based on last compression.
@ -261,7 +261,7 @@ protected:
friend class SlLinkgraphEdge; friend class SlLinkgraphEdge;
friend class LinkGraphJob; friend class LinkGraphJob;
CargoID cargo; ///< Cargo of this component's link graph. CargoType cargo; ///< Cargo of this component's link graph.
TimerGameEconomy::Date last_compression; ///< Last time the capacities and supplies were compressed. TimerGameEconomy::Date last_compression; ///< Last time the capacities and supplies were compressed.
NodeVector nodes; ///< Nodes in the component. NodeVector nodes; ///< Nodes in the component.
}; };

6
src/linkgraph/linkgraph_gui.cpp
View File

@ -86,7 +86,7 @@ void LinkGraphOverlay::RebuildCache()
StationLinkMap &seen_links = this->cached_links[from]; StationLinkMap &seen_links = this->cached_links[from];
uint supply = 0; uint supply = 0;
for (CargoID c : SetCargoBitIterator(this->cargo_mask)) { for (CargoType c : SetCargoBitIterator(this->cargo_mask)) {
if (!CargoSpec::Get(c)->IsValid()) continue; if (!CargoSpec::Get(c)->IsValid()) continue;
if (!LinkGraph::IsValidID(sta->goods[c].link_graph)) continue; if (!LinkGraph::IsValidID(sta->goods[c].link_graph)) continue;
const LinkGraph &lg = *LinkGraph::Get(sta->goods[c].link_graph); const LinkGraph &lg = *LinkGraph::Get(sta->goods[c].link_graph);
@ -212,7 +212,7 @@ inline bool LinkGraphOverlay::IsLinkVisible(Point pta, Point ptb, const DrawPixe
*/ */
void LinkGraphOverlay::AddLinks(const Station *from, const Station *to) void LinkGraphOverlay::AddLinks(const Station *from, const Station *to)
{ {
for (CargoID c : SetCargoBitIterator(this->cargo_mask)) { for (CargoType c : SetCargoBitIterator(this->cargo_mask)) {
if (!CargoSpec::Get(c)->IsValid()) continue; if (!CargoSpec::Get(c)->IsValid()) continue;
const GoodsEntry &ge = from->goods[c]; const GoodsEntry &ge = from->goods[c];
if (!LinkGraph::IsValidID(ge.link_graph) || if (!LinkGraph::IsValidID(ge.link_graph) ||
@ -241,7 +241,7 @@ void LinkGraphOverlay::AddLinks(const Station *from, const Station *to)
* @param new_shared If the new link is shared. * @param new_shared If the new link is shared.
* @param cargo LinkProperties to write the information to. * @param cargo LinkProperties to write the information to.
*/ */
/* static */ void LinkGraphOverlay::AddStats(CargoID new_cargo, uint new_cap, uint new_usg, uint new_plan, uint32_t time, bool new_shared, LinkProperties &cargo) /* static */ void LinkGraphOverlay::AddStats(CargoType new_cargo, uint new_cap, uint new_usg, uint new_plan, uint32_t time, bool new_shared, LinkProperties &cargo)
{ {
/* multiply the numbers by 32 in order to avoid comparing to 0 too often. */ /* multiply the numbers by 32 in order to avoid comparing to 0 too often. */
if (cargo.capacity == 0 || if (cargo.capacity == 0 ||

4
src/linkgraph/linkgraph_gui.h
View File

@ -26,7 +26,7 @@ struct LinkProperties {
/** Return the usage of the link to display. */ /** Return the usage of the link to display. */
uint Usage() const { return std::max(this->usage, this->planned); } uint Usage() const { return std::max(this->usage, this->planned); }
CargoID cargo; ///< Cargo type of the link. CargoType cargo; ///< Cargo type of the link.
uint capacity; ///< Capacity of the link. uint capacity; ///< Capacity of the link.
uint usage; ///< Actual usage of the link. uint usage; ///< Actual usage of the link.
uint planned; ///< Planned usage of the link. uint planned; ///< Planned usage of the link.
@ -94,7 +94,7 @@ protected:
void GetWidgetDpi(DrawPixelInfo *dpi) const; void GetWidgetDpi(DrawPixelInfo *dpi) const;
void RebuildCache(); void RebuildCache();
static void AddStats(CargoID new_cargo, uint new_cap, uint new_usg, uint new_flow, uint32_t time, bool new_shared, LinkProperties &cargo); static void AddStats(CargoType new_cargo, uint new_cap, uint new_usg, uint new_flow, uint32_t time, bool new_shared, LinkProperties &cargo);
static void DrawVertex(int x, int y, int size, int colour, int border_colour); static void DrawVertex(int x, int y, int size, int colour, int border_colour);
}; };

2
src/linkgraph/linkgraphjob.h
View File

@ -248,7 +248,7 @@ public:
* Get the cargo of the underlying link graph. * Get the cargo of the underlying link graph.
* @return Cargo. * @return Cargo.
*/ */
inline CargoID Cargo() const { return this->link_graph.Cargo(); } inline CargoType Cargo() const { return this->link_graph.Cargo(); }
/** /**
* Get the date when the underlying link graph was last compressed. * Get the date when the underlying link graph was last compressed.

10
src/linkgraph/refresh.cpp
View File

@ -85,7 +85,7 @@ LinkRefresher::LinkRefresher(Vehicle *vehicle, HopSet *seen_hops, bool allow_mer
* @param refit_cargo Cargo to refit to. * @param refit_cargo Cargo to refit to.
* @return True if any vehicle was refit; false if none was. * @return True if any vehicle was refit; false if none was.
*/ */
bool LinkRefresher::HandleRefit(CargoID refit_cargo) bool LinkRefresher::HandleRefit(CargoType refit_cargo)
{ {
this->cargo = refit_cargo; this->cargo = refit_cargo;
RefitList::iterator refit_it = this->refit_capacities.begin(); RefitList::iterator refit_it = this->refit_capacities.begin();
@ -99,7 +99,7 @@ bool LinkRefresher::HandleRefit(CargoID refit_cargo)
any_refit = true; any_refit = true;
/* Back up the vehicle's cargo type */ /* Back up the vehicle's cargo type */
CargoID temp_cid = v->cargo_type; CargoType temp_cargo_type = v->cargo_type;
uint8_t temp_subtype = v->cargo_subtype; uint8_t temp_subtype = v->cargo_subtype;
v->cargo_type = this->cargo; v->cargo_type = this->cargo;
v->cargo_subtype = GetBestFittingSubType(v, v, this->cargo); v->cargo_subtype = GetBestFittingSubType(v, v, this->cargo);
@ -108,7 +108,7 @@ bool LinkRefresher::HandleRefit(CargoID refit_cargo)
uint amount = e->DetermineCapacity(v, &mail_capacity); uint amount = e->DetermineCapacity(v, &mail_capacity);
/* Restore the original cargo type */ /* Restore the original cargo type */
v->cargo_type = temp_cid; v->cargo_type = temp_cargo_type;
v->cargo_subtype = temp_subtype; v->cargo_subtype = temp_subtype;
/* Skip on next refit. */ /* Skip on next refit. */
@ -202,7 +202,7 @@ void LinkRefresher::RefreshStats(const Order *cur, const Order *next)
Station *st = Station::GetIfValid(cur->GetDestination()); Station *st = Station::GetIfValid(cur->GetDestination());
if (st != nullptr && next_station != INVALID_STATION && next_station != st->index) { if (st != nullptr && next_station != INVALID_STATION && next_station != st->index) {
Station *st_to = Station::Get(next_station); Station *st_to = Station::Get(next_station);
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoType c = 0; c < NUM_CARGO; c++) {
/* Refresh the link and give it a minimum capacity. */ /* Refresh the link and give it a minimum capacity. */
uint cargo_quantity = this->capacities[c]; uint cargo_quantity = this->capacities[c];
@ -271,7 +271,7 @@ void LinkRefresher::RefreshLinks(const Order *cur, const Order *next, uint8_t fl
} else if (!HasBit(flags, IN_AUTOREFIT)) { } else if (!HasBit(flags, IN_AUTOREFIT)) {
SetBit(flags, IN_AUTOREFIT); SetBit(flags, IN_AUTOREFIT);
LinkRefresher backup(*this); LinkRefresher backup(*this);
for (CargoID c = 0; c != NUM_CARGO; ++c) { for (CargoType c = 0; c != NUM_CARGO; ++c) {
if (CargoSpec::Get(c)->IsValid() && this->HandleRefit(c)) { if (CargoSpec::Get(c)->IsValid() && this->HandleRefit(c)) {
this->RefreshLinks(cur, next, flags, num_hops); this->RefreshLinks(cur, next, flags, num_hops);
*this = backup; *this = backup;

14
src/linkgraph/refresh.h
View File

@ -37,10 +37,10 @@ protected:
* Simulated cargo type and capacity for prediction of future links. * Simulated cargo type and capacity for prediction of future links.
*/ */
struct RefitDesc { struct RefitDesc {
CargoID cargo; ///< Cargo type the vehicle will be carrying. CargoType cargo; ///< Cargo type the vehicle will be carrying.
uint16_t capacity; ///< Capacity the vehicle will have. uint16_t capacity; ///< Capacity the vehicle will have.
uint16_t remaining; ///< Capacity remaining from before the previous refit. uint16_t remaining; ///< Capacity remaining from before the previous refit.
RefitDesc(CargoID cargo, uint16_t capacity, uint16_t remaining) : RefitDesc(CargoType cargo, uint16_t capacity, uint16_t remaining) :
cargo(cargo), capacity(capacity), remaining(remaining) {} cargo(cargo), capacity(capacity), remaining(remaining) {}
}; };
@ -56,7 +56,7 @@ protected:
struct Hop { struct Hop {
OrderID from; ///< Last order where vehicle could interact with cargo or absolute first order. OrderID from; ///< Last order where vehicle could interact with cargo or absolute first order.
OrderID to; ///< Next order to be processed. OrderID to; ///< Next order to be processed.
CargoID cargo; ///< Cargo the consist is probably carrying or INVALID_CARGO if unknown. CargoType cargo; ///< Cargo the consist is probably carrying or INVALID_CARGO if unknown.
/** /**
* Default constructor should not be called but has to be visible for * Default constructor should not be called but has to be visible for
@ -70,7 +70,7 @@ protected:
* @param to Second order of the hop. * @param to Second order of the hop.
* @param cargo Cargo the consist is probably carrying when passing the hop. * @param cargo Cargo the consist is probably carrying when passing the hop.
*/ */
Hop(OrderID from, OrderID to, CargoID cargo) : from(from), to(to), cargo(cargo) {} Hop(OrderID from, OrderID to, CargoType cargo) : from(from), to(to), cargo(cargo) {}
bool operator<(const Hop &other) const; bool operator<(const Hop &other) const;
}; };
@ -78,16 +78,16 @@ protected:
typedef std::set<Hop> HopSet; typedef std::set<Hop> HopSet;
Vehicle *vehicle; ///< Vehicle for which the links should be refreshed. Vehicle *vehicle; ///< Vehicle for which the links should be refreshed.
CargoArray capacities{}; ///< Current added capacities per cargo ID in the consist. CargoArray capacities{}; ///< Current added capacities per cargo type in the consist.
RefitList refit_capacities; ///< Current state of capacity remaining from previous refits versus overall capacity per vehicle in the consist. RefitList refit_capacities; ///< Current state of capacity remaining from previous refits versus overall capacity per vehicle in the consist.
HopSet *seen_hops; ///< Hops already seen. If the same hop is seen twice we stop the algorithm. This is shared between all Refreshers of the same run. HopSet *seen_hops; ///< Hops already seen. If the same hop is seen twice we stop the algorithm. This is shared between all Refreshers of the same run.
CargoID cargo; ///< Cargo given in last refit order. CargoType cargo; ///< Cargo given in last refit order.
bool allow_merge; ///< If the refresher is allowed to merge or extend link graphs. bool allow_merge; ///< If the refresher is allowed to merge or extend link graphs.
bool is_full_loading; ///< If the vehicle is full loading. bool is_full_loading; ///< If the vehicle is full loading.
LinkRefresher(Vehicle *v, HopSet *seen_hops, bool allow_merge, bool is_full_loading); LinkRefresher(Vehicle *v, HopSet *seen_hops, bool allow_merge, bool is_full_loading);
bool HandleRefit(CargoID refit_cargo); bool HandleRefit(CargoType refit_cargo);
void ResetRefit(); void ResetRefit();
void RefreshStats(const Order *cur, const Order *next); void RefreshStats(const Order *cur, const Order *next);
const Order *PredictNextOrder(const Order *cur, const Order *next, uint8_t flags, uint num_hops = 0); const Order *PredictNextOrder(const Order *cur, const Order *next, uint8_t flags, uint num_hops = 0);

130
src/newgrf.cpp
View File

@ -964,8 +964,8 @@ static CargoTypes TranslateRefitMask(uint32_t refit_mask)
{ {
CargoTypes result = 0; CargoTypes result = 0;
for (uint8_t bit : SetBitIterator(refit_mask)) { for (uint8_t bit : SetBitIterator(refit_mask)) {
CargoID cargo = GetCargoTranslation(bit, _cur.grffile, true); CargoType cargo = GetCargoTranslation(bit, _cur.grffile, true);
if (IsValidCargoID(cargo)) SetBit(result, cargo); if (IsValidCargoType(cargo)) SetBit(result, cargo);
} }
return result; return result;
} }
@ -1322,8 +1322,8 @@ static ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, B
CargoTypes &ctt = prop == 0x2C ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask; CargoTypes &ctt = prop == 0x2C ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
ctt = 0; ctt = 0;
while (count--) { while (count--) {
CargoID ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
if (IsValidCargoID(ctype)) SetBit(ctt, ctype); if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
} }
break; break;
} }
@ -1531,8 +1531,8 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
CargoTypes &ctt = prop == 0x24 ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask; CargoTypes &ctt = prop == 0x24 ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
ctt = 0; ctt = 0;
while (count--) { while (count--) {
CargoID ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
if (IsValidCargoID(ctype)) SetBit(ctt, ctype); if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
} }
break; break;
} }
@ -1714,8 +1714,8 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
CargoTypes &ctt = prop == 0x1E ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask; CargoTypes &ctt = prop == 0x1E ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
ctt = 0; ctt = 0;
while (count--) { while (count--) {
CargoID ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
if (IsValidCargoID(ctype)) SetBit(ctt, ctype); if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
} }
break; break;
} }
@ -1887,8 +1887,8 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint first, uint last, int pro
CargoTypes &ctt = prop == 0x1D ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask; CargoTypes &ctt = prop == 0x1D ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
ctt = 0; ctt = 0;
while (count--) { while (count--) {
CargoID ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
if (IsValidCargoID(ctype)) SetBit(ctt, ctype); if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
} }
break; break;
} }
@ -2484,9 +2484,9 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
* climate. This can cause problems when copying the properties * climate. This can cause problems when copying the properties
* of a house that accepts food, where the new house is valid * of a house that accepts food, where the new house is valid
* in the temperate climate. */ * in the temperate climate. */
CargoID cid = housespec->accepts_cargo[2]; CargoType cargo_type = housespec->accepts_cargo[2];
if (!IsValidCargoID(cid)) cid = GetCargoIDByLabel(housespec->accepts_cargo_label[2]); if (!IsValidCargoType(cargo_type)) cargo_type = GetCargoTypeByLabel(housespec->accepts_cargo_label[2]);
if (!IsValidCargoID(cid)) { if (!IsValidCargoType(cargo_type)) {
housespec->cargo_acceptance[2] = 0; housespec->cargo_acceptance[2] = 0;
} }
} }
@ -2522,13 +2522,13 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
/* If value of goods is negative, it means in fact food or, if in toyland, fizzy_drink acceptance. /* If value of goods is negative, it means in fact food or, if in toyland, fizzy_drink acceptance.
* Else, we have "standard" 3rd cargo type, goods or candy, for toyland once more */ * Else, we have "standard" 3rd cargo type, goods or candy, for toyland once more */
CargoID cid = (goods >= 0) ? ((_settings_game.game_creation.landscape == LT_TOYLAND) ? GetCargoIDByLabel(CT_CANDY) : GetCargoIDByLabel(CT_GOODS)) : CargoType cargo_type = (goods >= 0) ? ((_settings_game.game_creation.landscape == LT_TOYLAND) ? GetCargoTypeByLabel(CT_CANDY) : GetCargoTypeByLabel(CT_GOODS)) :
((_settings_game.game_creation.landscape == LT_TOYLAND) ? GetCargoIDByLabel(CT_FIZZY_DRINKS) : GetCargoIDByLabel(CT_FOOD)); ((_settings_game.game_creation.landscape == LT_TOYLAND) ? GetCargoTypeByLabel(CT_FIZZY_DRINKS) : GetCargoTypeByLabel(CT_FOOD));
/* Make sure the cargo type is valid in this climate. */ /* Make sure the cargo type is valid in this climate. */
if (!IsValidCargoID(cid)) goods = 0; if (!IsValidCargoType(cargo_type)) goods = 0;
housespec->accepts_cargo[2] = cid; housespec->accepts_cargo[2] = cargo_type;
housespec->accepts_cargo_label[2] = CT_INVALID; housespec->accepts_cargo_label[2] = CT_INVALID;
housespec->cargo_acceptance[2] = abs(goods); // but we do need positive value here housespec->cargo_acceptance[2] = abs(goods); // but we do need positive value here
break; break;
@ -2610,9 +2610,9 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
for (uint j = 0; j < HOUSE_ORIGINAL_NUM_ACCEPTS; j++) { for (uint j = 0; j < HOUSE_ORIGINAL_NUM_ACCEPTS; j++) {
/* Get the cargo number from the 'list' */ /* Get the cargo number from the 'list' */
uint8_t cargo_part = GB(cargotypes, 8 * j, 8); uint8_t cargo_part = GB(cargotypes, 8 * j, 8);
CargoID cargo = GetCargoTranslation(cargo_part, _cur.grffile); CargoType cargo = GetCargoTranslation(cargo_part, _cur.grffile);
if (!IsValidCargoID(cargo)) { if (!IsValidCargoType(cargo)) {
/* Disable acceptance of invalid cargo type */ /* Disable acceptance of invalid cargo type */
housespec->cargo_acceptance[j] = 0; housespec->cargo_acceptance[j] = 0;
} else { } else {
@ -2630,8 +2630,8 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
case 0x20: { // Cargo acceptance watch list case 0x20: { // Cargo acceptance watch list
uint8_t count = buf.ReadByte(); uint8_t count = buf.ReadByte();
for (uint8_t j = 0; j < count; j++) { for (uint8_t j = 0; j < count; j++) {
CargoID cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
if (IsValidCargoID(cargo)) SetBit(housespec->watched_cargoes, cargo); if (IsValidCargoType(cargo)) SetBit(housespec->watched_cargoes, cargo);
} }
break; break;
} }
@ -3856,7 +3856,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
} }
for (size_t i = 0; i < std::size(indsp->produced_cargo); i++) { for (size_t i = 0; i < std::size(indsp->produced_cargo); i++) {
if (i < num_cargoes) { if (i < num_cargoes) {
CargoID cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
indsp->produced_cargo[i] = cargo; indsp->produced_cargo[i] = cargo;
} else { } else {
indsp->produced_cargo[i] = INVALID_CARGO; indsp->produced_cargo[i] = INVALID_CARGO;
@ -3875,7 +3875,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
} }
for (size_t i = 0; i < std::size(indsp->accepts_cargo); i++) { for (size_t i = 0; i < std::size(indsp->accepts_cargo); i++) {
if (i < num_cargoes) { if (i < num_cargoes) {
CargoID cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile); CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
indsp->accepts_cargo[i] = cargo; indsp->accepts_cargo[i] = cargo;
} else { } else {
indsp->accepts_cargo[i] = INVALID_CARGO; indsp->accepts_cargo[i] = INVALID_CARGO;
@ -5536,8 +5536,8 @@ static void NewSpriteGroup(ByteReader &buf)
} }
for (uint i = 0; i < group->num_input; i++) { for (uint i = 0; i < group->num_input; i++) {
uint8_t rawcargo = buf.ReadByte(); uint8_t rawcargo = buf.ReadByte();
CargoID cargo = GetCargoTranslation(rawcargo, _cur.grffile); CargoType cargo = GetCargoTranslation(rawcargo, _cur.grffile);
if (!IsValidCargoID(cargo)) { if (!IsValidCargoType(cargo)) {
/* The mapped cargo is invalid. This is permitted at this point, /* The mapped cargo is invalid. This is permitted at this point,
* as long as the result is not used. Mark it invalid so this * as long as the result is not used. Mark it invalid so this
* can be tested later. */ * can be tested later. */
@ -5558,8 +5558,8 @@ static void NewSpriteGroup(ByteReader &buf)
} }
for (uint i = 0; i < group->num_output; i++) { for (uint i = 0; i < group->num_output; i++) {
uint8_t rawcargo = buf.ReadByte(); uint8_t rawcargo = buf.ReadByte();
CargoID cargo = GetCargoTranslation(rawcargo, _cur.grffile); CargoType cargo = GetCargoTranslation(rawcargo, _cur.grffile);
if (!IsValidCargoID(cargo)) { if (!IsValidCargoType(cargo)) {
/* Mark this result as invalid to use */ /* Mark this result as invalid to use */
group->version = 0xFF; group->version = 0xFF;
} else if (std::find(group->cargo_output, group->cargo_output + i, cargo) != group->cargo_output + i) { } else if (std::find(group->cargo_output, group->cargo_output + i, cargo) != group->cargo_output + i) {
@ -5603,7 +5603,7 @@ std::span<const CargoLabel> GetCargoTranslationTable(const GRFFile &grffile)
return GetClimateIndependentCargoTranslationTable(); return GetClimateIndependentCargoTranslationTable();
} }
static CargoID TranslateCargo(uint8_t feature, uint8_t ctype) static CargoType TranslateCargo(uint8_t feature, uint8_t ctype)
{ {
/* Special cargo types for purchase list and stations */ /* Special cargo types for purchase list and stations */
if ((feature == GSF_STATIONS || feature == GSF_ROADSTOPS) && ctype == 0xFE) return SpriteGroupCargo::SG_DEFAULT_NA; if ((feature == GSF_STATIONS || feature == GSF_ROADSTOPS) && ctype == 0xFE) return SpriteGroupCargo::SG_DEFAULT_NA;
@ -5624,14 +5624,14 @@ static CargoID TranslateCargo(uint8_t feature, uint8_t ctype)
return INVALID_CARGO; return INVALID_CARGO;
} }
CargoID cid = GetCargoIDByLabel(cl); CargoType cargo_type = GetCargoTypeByLabel(cl);
if (!IsValidCargoID(cid)) { if (!IsValidCargoType(cargo_type)) {
GrfMsg(5, "TranslateCargo: Cargo '{:c}{:c}{:c}{:c}' unsupported, skipping.", GB(cl.base(), 24, 8), GB(cl.base(), 16, 8), GB(cl.base(), 8, 8), GB(cl.base(), 0, 8)); GrfMsg(5, "TranslateCargo: Cargo '{:c}{:c}{:c}{:c}' unsupported, skipping.", GB(cl.base(), 24, 8), GB(cl.base(), 16, 8), GB(cl.base(), 8, 8), GB(cl.base(), 0, 8));
return INVALID_CARGO; return INVALID_CARGO;
} }
GrfMsg(6, "TranslateCargo: Cargo '{:c}{:c}{:c}{:c}' mapped to cargo type {}.", GB(cl.base(), 24, 8), GB(cl.base(), 16, 8), GB(cl.base(), 8, 8), GB(cl.base(), 0, 8), cid); GrfMsg(6, "TranslateCargo: Cargo '{:c}{:c}{:c}{:c}' mapped to cargo type {}.", GB(cl.base(), 24, 8), GB(cl.base(), 16, 8), GB(cl.base(), 8, 8), GB(cl.base(), 0, 8), cargo_type);
return cid; return cargo_type;
} }
@ -5690,8 +5690,8 @@ static void VehicleMapSpriteGroup(ByteReader &buf, uint8_t feature, uint8_t idco
GrfMsg(8, "VehicleMapSpriteGroup: * [{}] Cargo type 0x{:X}, group id 0x{:02X}", c, ctype, groupid); GrfMsg(8, "VehicleMapSpriteGroup: * [{}] Cargo type 0x{:X}, group id 0x{:02X}", c, ctype, groupid);
CargoID cid = TranslateCargo(feature, ctype); CargoType cargo_type = TranslateCargo(feature, ctype);
if (!IsValidCargoID(cid)) continue; if (!IsValidCargoType(cargo_type)) continue;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
EngineID engine = engines[i]; EngineID engine = engines[i];
@ -5699,9 +5699,9 @@ static void VehicleMapSpriteGroup(ByteReader &buf, uint8_t feature, uint8_t idco
GrfMsg(7, "VehicleMapSpriteGroup: [{}] Engine {}...", i, engine); GrfMsg(7, "VehicleMapSpriteGroup: [{}] Engine {}...", i, engine);
if (wagover) { if (wagover) {
SetWagonOverrideSprites(engine, cid, _cur.spritegroups[groupid], last_engines); SetWagonOverrideSprites(engine, cargo_type, _cur.spritegroups[groupid], last_engines);
} else { } else {
SetCustomEngineSprites(engine, cid, _cur.spritegroups[groupid]); SetCustomEngineSprites(engine, cargo_type, _cur.spritegroups[groupid]);
} }
} }
} }
@ -5770,7 +5770,7 @@ static void StationMapSpriteGroup(ByteReader &buf, uint8_t idcount)
if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue; if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue;
ctype = TranslateCargo(GSF_STATIONS, ctype); ctype = TranslateCargo(GSF_STATIONS, ctype);
if (!IsValidCargoID(ctype)) continue; if (!IsValidCargoType(ctype)) continue;
for (auto &station : stations) { for (auto &station : stations) {
StationSpec *statspec = station >= _cur.grffile->stations.size() ? nullptr : _cur.grffile->stations[station].get(); StationSpec *statspec = station >= _cur.grffile->stations.size() ? nullptr : _cur.grffile->stations[station].get();
@ -5920,13 +5920,13 @@ static void CargoMapSpriteGroup(ByteReader &buf, uint8_t idcount)
uint16_t groupid = buf.ReadWord(); uint16_t groupid = buf.ReadWord();
if (!IsValidGroupID(groupid, "CargoMapSpriteGroup")) return; if (!IsValidGroupID(groupid, "CargoMapSpriteGroup")) return;
for (auto &cid : cargoes) { for (auto &cargo_type : cargoes) {
if (cid >= NUM_CARGO) { if (cargo_type >= NUM_CARGO) {
GrfMsg(1, "CargoMapSpriteGroup: Cargo ID {} out of range, skipping", cid); GrfMsg(1, "CargoMapSpriteGroup: Cargo type {} out of range, skipping", cargo_type);
continue; continue;
} }
CargoSpec *cs = CargoSpec::Get(cid); CargoSpec *cs = CargoSpec::Get(cargo_type);
cs->grffile = _cur.grffile; cs->grffile = _cur.grffile;
cs->group = _cur.spritegroups[groupid]; cs->group = _cur.spritegroups[groupid];
} }
@ -6142,7 +6142,7 @@ static void RoadStopMapSpriteGroup(ByteReader &buf, uint8_t idcount)
if (!IsValidGroupID(groupid, "RoadStopMapSpriteGroup")) continue; if (!IsValidGroupID(groupid, "RoadStopMapSpriteGroup")) continue;
ctype = TranslateCargo(GSF_ROADSTOPS, ctype); ctype = TranslateCargo(GSF_ROADSTOPS, ctype);
if (!IsValidCargoID(ctype)) continue; if (!IsValidCargoType(ctype)) continue;
for (auto &roadstop : roadstops) { for (auto &roadstop : roadstops) {
RoadStopSpec *roadstopspec = roadstop >= _cur.grffile->roadstops.size() ? nullptr : _cur.grffile->roadstops[roadstop].get(); RoadStopSpec *roadstopspec = roadstop >= _cur.grffile->roadstops.size() ? nullptr : _cur.grffile->roadstops[roadstop].get();
@ -6913,9 +6913,9 @@ static void SkipIf(ByteReader &buf)
if (condtype >= 0x0B) { if (condtype >= 0x0B) {
/* Tests that ignore 'param' */ /* Tests that ignore 'param' */
switch (condtype) { switch (condtype) {
case 0x0B: result = !IsValidCargoID(GetCargoIDByLabel(CargoLabel(BSWAP32(cond_val)))); case 0x0B: result = !IsValidCargoType(GetCargoTypeByLabel(CargoLabel(BSWAP32(cond_val))));
break; break;
case 0x0C: result = IsValidCargoID(GetCargoIDByLabel(CargoLabel(BSWAP32(cond_val)))); case 0x0C: result = IsValidCargoType(GetCargoTypeByLabel(CargoLabel(BSWAP32(cond_val))));
break; break;
case 0x0D: result = GetRailTypeByLabel(BSWAP32(cond_val)) == INVALID_RAILTYPE; case 0x0D: result = GetRailTypeByLabel(BSWAP32(cond_val)) == INVALID_RAILTYPE;
break; break;
@ -8963,8 +8963,8 @@ GRFFile::GRFFile(const GRFConfig *config)
static CargoLabel GetActiveCargoLabel(const std::initializer_list<CargoLabel> &labels) static CargoLabel GetActiveCargoLabel(const std::initializer_list<CargoLabel> &labels)
{ {
for (const CargoLabel &label : labels) { for (const CargoLabel &label : labels) {
CargoID cid = GetCargoIDByLabel(label); CargoType cargo_type = GetCargoTypeByLabel(label);
if (cid != INVALID_CARGO) return label; if (cargo_type != INVALID_CARGO) return label;
} }
return CT_INVALID; return CT_INVALID;
} }
@ -8998,8 +8998,8 @@ static CargoLabel GetActiveCargoLabel(const std::variant<CargoLabel, MixedCargoT
static void CalculateRefitMasks() static void CalculateRefitMasks()
{ {
CargoTypes original_known_cargoes = 0; CargoTypes original_known_cargoes = 0;
for (CargoID cid = 0; cid != NUM_CARGO; ++cid) { for (CargoType cargo_type = 0; cargo_type != NUM_CARGO; ++cargo_type) {
if (IsDefaultCargo(cid)) SetBit(original_known_cargoes, cid); if (IsDefaultCargo(cargo_type)) SetBit(original_known_cargoes, cargo_type);
} }
for (Engine *e : Engine::Iterate()) { for (Engine *e : Engine::Iterate()) {
@ -9008,8 +9008,8 @@ static void CalculateRefitMasks()
bool only_defaultcargo; ///< Set if the vehicle shall carry only the default cargo bool only_defaultcargo; ///< Set if the vehicle shall carry only the default cargo
/* Apply default cargo translation map if cargo type hasn't been set, either explicitly or by aircraft cargo handling. */ /* Apply default cargo translation map if cargo type hasn't been set, either explicitly or by aircraft cargo handling. */
if (!IsValidCargoID(e->info.cargo_type)) { if (!IsValidCargoType(e->info.cargo_type)) {
e->info.cargo_type = GetCargoIDByLabel(GetActiveCargoLabel(e->info.cargo_label)); e->info.cargo_type = GetCargoTypeByLabel(GetActiveCargoLabel(e->info.cargo_label));
} }
/* If the NewGRF did not set any cargo properties, we apply default values. */ /* If the NewGRF did not set any cargo properties, we apply default values. */
@ -9094,7 +9094,7 @@ static void CalculateRefitMasks()
} }
_gted[engine].UpdateRefittability(_gted[engine].cargo_allowed != 0); _gted[engine].UpdateRefittability(_gted[engine].cargo_allowed != 0);
if (IsValidCargoID(ei->cargo_type)) ClrBit(_gted[engine].ctt_exclude_mask, ei->cargo_type); if (IsValidCargoType(ei->cargo_type)) ClrBit(_gted[engine].ctt_exclude_mask, ei->cargo_type);
} }
/* Compute refittability */ /* Compute refittability */
@ -9142,24 +9142,24 @@ static void CalculateRefitMasks()
} }
/* Clear invalid cargoslots (from default vehicles or pre-NewCargo GRFs) */ /* Clear invalid cargoslots (from default vehicles or pre-NewCargo GRFs) */
if (IsValidCargoID(ei->cargo_type) && !HasBit(_cargo_mask, ei->cargo_type)) ei->cargo_type = INVALID_CARGO; if (IsValidCargoType(ei->cargo_type) && !HasBit(_cargo_mask, ei->cargo_type)) ei->cargo_type = INVALID_CARGO;
/* Ensure that the vehicle is either not refittable, or that the default cargo is one of the refittable cargoes. /* 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. */ * Note: Vehicles refittable to no cargo are handle differently to vehicle refittable to a single cargo. The latter might have subtypes. */
if (!only_defaultcargo && (e->type != VEH_SHIP || e->u.ship.old_refittable) && IsValidCargoID(ei->cargo_type) && !HasBit(ei->refit_mask, ei->cargo_type)) { if (!only_defaultcargo && (e->type != VEH_SHIP || e->u.ship.old_refittable) && IsValidCargoType(ei->cargo_type) && !HasBit(ei->refit_mask, ei->cargo_type)) {
ei->cargo_type = INVALID_CARGO; ei->cargo_type = INVALID_CARGO;
} }
/* Check if this engine's cargo type is valid. If not, set to the first refittable /* Check if this engine's cargo type is valid. If not, set to the first refittable
* cargo type. Finally disable the vehicle, if there is still no cargo. */ * cargo type. Finally disable the vehicle, if there is still no cargo. */
if (!IsValidCargoID(ei->cargo_type) && ei->refit_mask != 0) { if (!IsValidCargoType(ei->cargo_type) && ei->refit_mask != 0) {
/* Figure out which CTT to use for the default cargo, if it is 'first refittable'. */ /* Figure out which CTT to use for the default cargo, if it is 'first refittable'. */
const GRFFile *file = _gted[engine].defaultcargo_grf; const GRFFile *file = _gted[engine].defaultcargo_grf;
if (file == nullptr) file = e->GetGRF(); if (file == nullptr) file = e->GetGRF();
if (file != nullptr && file->grf_version >= 8 && !file->cargo_list.empty()) { if (file != nullptr && file->grf_version >= 8 && !file->cargo_list.empty()) {
/* Use first refittable cargo from cargo translation table */ /* Use first refittable cargo from cargo translation table */
uint8_t best_local_slot = UINT8_MAX; uint8_t best_local_slot = UINT8_MAX;
for (CargoID cargo_type : SetCargoBitIterator(ei->refit_mask)) { for (CargoType cargo_type : SetCargoBitIterator(ei->refit_mask)) {
uint8_t local_slot = file->cargo_map[cargo_type]; uint8_t local_slot = file->cargo_map[cargo_type];
if (local_slot < best_local_slot) { if (local_slot < best_local_slot) {
best_local_slot = local_slot; best_local_slot = local_slot;
@ -9168,20 +9168,20 @@ static void CalculateRefitMasks()
} }
} }
if (!IsValidCargoID(ei->cargo_type)) { if (!IsValidCargoType(ei->cargo_type)) {
/* Use first refittable cargo slot */ /* Use first refittable cargo slot */
ei->cargo_type = (CargoID)FindFirstBit(ei->refit_mask); ei->cargo_type = (CargoType)FindFirstBit(ei->refit_mask);
} }
} }
if (!IsValidCargoID(ei->cargo_type) && e->type == VEH_TRAIN && e->u.rail.railveh_type != RAILVEH_WAGON && e->u.rail.capacity == 0) { if (!IsValidCargoType(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. /* 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 * Fallback to the first available instead, if the cargo type has not been changed (as indicated by
* cargo_label not being CT_INVALID). */ * cargo_label not being CT_INVALID). */
if (GetActiveCargoLabel(ei->cargo_label) != CT_INVALID) { if (GetActiveCargoLabel(ei->cargo_label) != CT_INVALID) {
ei->cargo_type = static_cast<CargoID>(FindFirstBit(_standard_cargo_mask)); ei->cargo_type = static_cast<CargoType>(FindFirstBit(_standard_cargo_mask));
} }
} }
if (!IsValidCargoID(ei->cargo_type)) ei->climates = 0; if (!IsValidCargoType(ei->cargo_type)) ei->climates = 0;
/* Clear refit_mask for not refittable ships */ /* Clear refit_mask for not refittable ships */
if (e->type == VEH_SHIP && !e->u.ship.old_refittable) { if (e->type == VEH_SHIP && !e->u.ship.old_refittable) {
@ -9421,9 +9421,9 @@ static void FinaliseHouseArray()
/* Apply default cargo translation map for unset cargo slots */ /* Apply default cargo translation map for unset cargo slots */
for (uint i = 0; i < lengthof(hs->accepts_cargo_label); ++i) { for (uint i = 0; i < lengthof(hs->accepts_cargo_label); ++i) {
if (!IsValidCargoID(hs->accepts_cargo[i])) hs->accepts_cargo[i] = GetCargoIDByLabel(hs->accepts_cargo_label[i]); if (!IsValidCargoType(hs->accepts_cargo[i])) hs->accepts_cargo[i] = GetCargoTypeByLabel(hs->accepts_cargo_label[i]);
/* Disable acceptance if cargo type is invalid. */ /* Disable acceptance if cargo type is invalid. */
if (!IsValidCargoID(hs->accepts_cargo[i])) hs->cargo_acceptance[i] = 0; if (!IsValidCargoType(hs->accepts_cargo[i])) hs->cargo_acceptance[i] = 0;
} }
} }
@ -9476,17 +9476,17 @@ static void FinaliseIndustriesArray()
/* Apply default cargo translation map for unset cargo slots */ /* Apply default cargo translation map for unset cargo slots */
for (size_t i = 0; i < std::size(indsp.produced_cargo_label); ++i) { for (size_t i = 0; i < std::size(indsp.produced_cargo_label); ++i) {
if (!IsValidCargoID(indsp.produced_cargo[i])) indsp.produced_cargo[i] = GetCargoIDByLabel(GetActiveCargoLabel(indsp.produced_cargo_label[i])); if (!IsValidCargoType(indsp.produced_cargo[i])) indsp.produced_cargo[i] = GetCargoTypeByLabel(GetActiveCargoLabel(indsp.produced_cargo_label[i]));
} }
for (size_t i = 0; i < std::size(indsp.accepts_cargo_label); ++i) { for (size_t i = 0; i < std::size(indsp.accepts_cargo_label); ++i) {
if (!IsValidCargoID(indsp.accepts_cargo[i])) indsp.accepts_cargo[i] = GetCargoIDByLabel(GetActiveCargoLabel(indsp.accepts_cargo_label[i])); if (!IsValidCargoType(indsp.accepts_cargo[i])) indsp.accepts_cargo[i] = GetCargoTypeByLabel(GetActiveCargoLabel(indsp.accepts_cargo_label[i]));
} }
} }
for (auto &indtsp : _industry_tile_specs) { for (auto &indtsp : _industry_tile_specs) {
/* Apply default cargo translation map for unset cargo slots */ /* Apply default cargo translation map for unset cargo slots */
for (size_t i = 0; i < std::size(indtsp.accepts_cargo_label); ++i) { for (size_t i = 0; i < std::size(indtsp.accepts_cargo_label); ++i) {
if (!IsValidCargoID(indtsp.accepts_cargo[i])) indtsp.accepts_cargo[i] = GetCargoIDByLabel(GetActiveCargoLabel(indtsp.accepts_cargo_label[i])); if (!IsValidCargoType(indtsp.accepts_cargo[i])) indtsp.accepts_cargo[i] = GetCargoTypeByLabel(GetActiveCargoLabel(indtsp.accepts_cargo_label[i]));
} }
} }
} }

2
src/newgrf.h
View File

@ -127,7 +127,7 @@ struct GRFFile : ZeroedMemoryAllocator {
std::vector<GRFLabel> labels; ///< List of labels std::vector<GRFLabel> labels; ///< List of labels
std::vector<CargoLabel> cargo_list; ///< Cargo translation table (local ID -> label) std::vector<CargoLabel> cargo_list; ///< Cargo translation table (local ID -> label)
std::array<uint8_t, NUM_CARGO> cargo_map{}; ///< Inverse cargo translation table (CargoID -> local ID) std::array<uint8_t, NUM_CARGO> cargo_map{}; ///< Inverse cargo translation table (CargoType -> local ID)
std::vector<RailTypeLabel> railtype_list; ///< Railtype translation table std::vector<RailTypeLabel> railtype_list; ///< Railtype translation table
std::array<RailType, RAILTYPE_END> railtype_map{}; std::array<RailType, RAILTYPE_END> railtype_map{};

4
src/newgrf_airporttiles.cpp
View File

@ -296,7 +296,7 @@ void AnimateAirportTile(TileIndex tile)
AirportTileAnimationBase::AnimateTile(ats, Station::GetByTile(tile), tile, HasBit(ats->animation_special_flags, 0)); AirportTileAnimationBase::AnimateTile(ats, Station::GetByTile(tile), tile, HasBit(ats->animation_special_flags, 0));
} }
void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigger trigger, CargoID cargo_type) void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigger trigger, CargoType cargo_type)
{ {
const AirportTileSpec *ats = AirportTileSpec::GetByTile(tile); const AirportTileSpec *ats = AirportTileSpec::GetByTile(tile);
if (!HasBit(ats->animation.triggers, trigger)) return; if (!HasBit(ats->animation.triggers, trigger)) return;
@ -304,7 +304,7 @@ void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigg
AirportTileAnimationBase::ChangeAnimationFrame(CBID_AIRPTILE_ANIM_START_STOP, ats, st, tile, Random(), (uint8_t)trigger | (cargo_type << 8)); AirportTileAnimationBase::ChangeAnimationFrame(CBID_AIRPTILE_ANIM_START_STOP, ats, st, tile, Random(), (uint8_t)trigger | (cargo_type << 8));
} }
void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoID cargo_type) void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoType cargo_type)
{ {
if (st->airport.tile == INVALID_TILE) return; if (st->airport.tile == INVALID_TILE) return;

4
src/newgrf_airporttiles.h
View File

@ -85,8 +85,8 @@ private:
}; };
void AnimateAirportTile(TileIndex tile); void AnimateAirportTile(TileIndex tile);
void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigger trigger, CargoID cargo_type = INVALID_CARGO); void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoID cargo_type = INVALID_CARGO); void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
bool DrawNewAirportTile(TileInfo *ti, Station *st, const AirportTileSpec *airts); bool DrawNewAirportTile(TileInfo *ti, Station *st, const AirportTileSpec *airts);
#endif /* NEWGRF_AIRPORTTILES_H */ #endif /* NEWGRF_AIRPORTTILES_H */

8
src/newgrf_cargo.cpp
View File

@ -69,15 +69,15 @@ uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2,
} }
/** /**
* Translate a GRF-local cargo slot/bitnum into a CargoID. * Translate a GRF-local cargo slot/bitnum into a CargoType.
* @param cargo GRF-local cargo slot/bitnum. * @param cargo GRF-local cargo slot/bitnum.
* @param grffile Originating GRF file. * @param grffile Originating GRF file.
* @param usebit Defines the meaning of \a cargo for GRF version < 7. * @param usebit Defines the meaning of \a cargo for GRF version < 7.
* If true, then \a cargo is a bitnum. If false, then \a cargo is a cargoslot. * If true, then \a cargo is a bitnum. If false, then \a cargo is a cargoslot.
* For GRF version >= 7 \a cargo is always a translated cargo bit. * For GRF version >= 7 \a cargo is always a translated cargo bit.
* @return CargoID or INVALID_CARGO if the cargo is not available. * @return CargoType or INVALID_CARGO if the cargo is not available.
*/ */
CargoID GetCargoTranslation(uint8_t cargo, const GRFFile *grffile, bool usebit) CargoType GetCargoTranslation(uint8_t cargo, const GRFFile *grffile, bool usebit)
{ {
/* We can't use GetCargoTranslationTable here as the usebit flag changes behviour. */ /* We can't use GetCargoTranslationTable here as the usebit flag changes behviour. */
/* Pre-version 7 uses the bitnum lookup from (standard in v8) instead of climate dependent in some places.. */ /* Pre-version 7 uses the bitnum lookup from (standard in v8) instead of climate dependent in some places.. */
@ -90,6 +90,6 @@ CargoID GetCargoTranslation(uint8_t cargo, const GRFFile *grffile, bool usebit)
cargo_list = GetClimateIndependentCargoTranslationTable(); cargo_list = GetClimateIndependentCargoTranslationTable();
} }
if (cargo < cargo_list.size()) return GetCargoIDByLabel(cargo_list[cargo]); if (cargo < cargo_list.size()) return GetCargoTypeByLabel(cargo_list[cargo]);
return INVALID_CARGO; return INVALID_CARGO;
} }

8
src/newgrf_cargo.h
View File

@ -20,9 +20,9 @@
* e.g. in purchase lists, or if no specific cargo type sprite group is supplied. * e.g. in purchase lists, or if no specific cargo type sprite group is supplied.
*/ */
namespace SpriteGroupCargo { namespace SpriteGroupCargo {
static constexpr CargoID SG_DEFAULT = NUM_CARGO; ///< Default type used when no more-specific cargo matches. static constexpr CargoType SG_DEFAULT = NUM_CARGO; ///< Default type used when no more-specific cargo matches.
static constexpr CargoID SG_PURCHASE = NUM_CARGO + 1; ///< Used in purchase lists before an item exists. static constexpr CargoType SG_PURCHASE = NUM_CARGO + 1; ///< Used in purchase lists before an item exists.
static constexpr CargoID SG_DEFAULT_NA = NUM_CARGO + 2; ///< Used only by stations and roads when no more-specific cargo matches. static constexpr CargoType SG_DEFAULT_NA = NUM_CARGO + 2; ///< Used only by stations and roads when no more-specific cargo matches.
}; };
/* Forward declarations of structs used */ /* Forward declarations of structs used */
@ -31,7 +31,7 @@ struct GRFFile;
SpriteID GetCustomCargoSprite(const CargoSpec *cs); SpriteID GetCustomCargoSprite(const CargoSpec *cs);
uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2, const CargoSpec *cs); uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2, const CargoSpec *cs);
CargoID GetCargoTranslation(uint8_t cargo, const GRFFile *grffile, bool usebit = false); CargoType GetCargoTranslation(uint8_t cargo, const GRFFile *grffile, bool usebit = false);
std::span<const CargoLabel> GetClimateDependentCargoTranslationTable(); std::span<const CargoLabel> GetClimateDependentCargoTranslationTable();
std::span<const CargoLabel> GetClimateIndependentCargoTranslationTable(); std::span<const CargoLabel> GetClimateIndependentCargoTranslationTable();

2
src/newgrf_debug_gui.cpp
View File

@ -494,7 +494,7 @@ struct NewGRFInspectWindow : Window {
break; break;
case NIT_CARGO: case NIT_CARGO:
string = IsValidCargoID(value) ? CargoSpec::Get(value)->name : STR_QUANTITY_N_A; string = IsValidCargoType(value) ? CargoSpec::Get(value)->name : STR_QUANTITY_N_A;
break; break;
default: default:

16
src/newgrf_engine.cpp
View File

@ -27,7 +27,7 @@
#include "safeguards.h" #include "safeguards.h"
void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *group, std::span<EngineID> engine_ids) void SetWagonOverrideSprites(EngineID engine, CargoType cargo, const SpriteGroup *group, std::span<EngineID> engine_ids)
{ {
Engine *e = Engine::Get(engine); Engine *e = Engine::Get(engine);
@ -39,7 +39,7 @@ void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *
wo->engines.assign(engine_ids.begin(), engine_ids.end()); wo->engines.assign(engine_ids.begin(), engine_ids.end());
} }
const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, EngineID overriding_engine) const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoType cargo, EngineID overriding_engine)
{ {
const Engine *e = Engine::Get(engine); const Engine *e = Engine::Get(engine);
@ -50,7 +50,7 @@ const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, Eng
return nullptr; return nullptr;
} }
void SetCustomEngineSprites(EngineID engine, CargoID cargo, const SpriteGroup *group) void SetCustomEngineSprites(EngineID engine, CargoType cargo, const SpriteGroup *group)
{ {
Engine *e = Engine::Get(engine); Engine *e = Engine::Get(engine);
assert(cargo < std::size(e->grf_prop.spritegroup)); assert(cargo < std::size(e->grf_prop.spritegroup));
@ -453,7 +453,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
/* Pick the most common cargo type */ /* Pick the most common cargo type */
auto cargo_it = std::max_element(std::begin(common_cargoes), std::end(common_cargoes)); auto cargo_it = std::max_element(std::begin(common_cargoes), std::end(common_cargoes));
/* Return INVALID_CARGO if nothing is carried */ /* Return INVALID_CARGO if nothing is carried */
CargoID common_cargo_type = (*cargo_it == 0) ? INVALID_CARGO : static_cast<CargoID>(std::distance(std::begin(common_cargoes), cargo_it)); CargoType common_cargo_type = (*cargo_it == 0) ? INVALID_CARGO : static_cast<CargoType>(std::distance(std::begin(common_cargoes), cargo_it));
/* Count subcargo types of common_cargo_type */ /* Count subcargo types of common_cargo_type */
std::array<uint8_t, UINT8_MAX + 1> common_subtypes{}; std::array<uint8_t, UINT8_MAX + 1> common_subtypes{};
@ -476,7 +476,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
} }
/* The cargo translation is specific to the accessing GRF, and thus cannot be cached. */ /* The cargo translation is specific to the accessing GRF, and thus cannot be cached. */
CargoID common_cargo_type = (v->grf_cache.consist_cargo_information >> 8) & 0xFF; CargoType common_cargo_type = (v->grf_cache.consist_cargo_information >> 8) & 0xFF;
/* Note: /* Note:
* - Unlike everywhere else the cargo translation table is only used since grf version 8, not 7. * - Unlike everywhere else the cargo translation table is only used since grf version 8, not 7.
@ -949,8 +949,8 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
case 0x46: return 0; // Motion counter case 0x46: return 0; // Motion counter
case 0x47: { // Vehicle cargo info case 0x47: { // Vehicle cargo info
const Engine *e = Engine::Get(this->self_type); const Engine *e = Engine::Get(this->self_type);
CargoID cargo_type = e->GetDefaultCargoType(); CargoType cargo_type = e->GetDefaultCargoType();
if (IsValidCargoID(cargo_type)) { if (IsValidCargoType(cargo_type)) {
const CargoSpec *cs = CargoSpec::Get(cargo_type); const CargoSpec *cs = CargoSpec::Get(cargo_type);
return (cs->classes << 16) | (cs->weight << 8) | this->ro.grffile->cargo_map[cargo_type]; return (cs->classes << 16) | (cs->weight << 8) | this->ro.grffile->cargo_map[cargo_type];
} else { } else {
@ -1062,7 +1062,7 @@ VehicleResolverObject::VehicleResolverObject(EngineID engine_type, const Vehicle
if (this->root_spritegroup == nullptr) { if (this->root_spritegroup == nullptr) {
const Engine *e = Engine::Get(engine_type); const Engine *e = Engine::Get(engine_type);
CargoID cargo = v != nullptr ? v->cargo_type : SpriteGroupCargo::SG_PURCHASE; CargoType cargo = v != nullptr ? v->cargo_type : SpriteGroupCargo::SG_PURCHASE;
assert(cargo < std::size(e->grf_prop.spritegroup)); assert(cargo < std::size(e->grf_prop.spritegroup));
this->root_spritegroup = e->grf_prop.spritegroup[cargo] != nullptr ? e->grf_prop.spritegroup[cargo] : e->grf_prop.spritegroup[SpriteGroupCargo::SG_DEFAULT]; this->root_spritegroup = e->grf_prop.spritegroup[cargo] != nullptr ? e->grf_prop.spritegroup[cargo] : e->grf_prop.spritegroup[SpriteGroupCargo::SG_DEFAULT];
} }

6
src/newgrf_engine.h
View File

@ -76,9 +76,9 @@ static const uint VEHICLEINFO_FULL_VEHICLE_WIDTH = 32;
struct VehicleSpriteSeq; struct VehicleSpriteSeq;
void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, std::span<EngineID> engine_ids); void SetWagonOverrideSprites(EngineID engine, CargoType cargo, const struct SpriteGroup *group, std::span<EngineID> engine_ids);
const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, EngineID overriding_engine); const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoType cargo, EngineID overriding_engine);
void SetCustomEngineSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group); void SetCustomEngineSprites(EngineID engine, CargoType cargo, const struct SpriteGroup *group);
void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result); void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result);
#define GetCustomVehicleSprite(v, direction, image_type, result) GetCustomEngineSprite(v->engine_type, v, direction, image_type, result) #define GetCustomVehicleSprite(v, direction, image_type, result) GetCustomEngineSprite(v->engine_type, v, direction, image_type, result)

4
src/newgrf_generic.cpp
View File

@ -19,7 +19,7 @@
/** Scope resolver for generic objects and properties. */ /** Scope resolver for generic objects and properties. */
struct GenericScopeResolver : public ScopeResolver { struct GenericScopeResolver : public ScopeResolver {
CargoID cargo_type; CargoType cargo_type;
uint8_t default_selection; uint8_t default_selection;
uint8_t src_industry; ///< Source industry substitute type. 0xFF for "town", 0xFE for "unknown". uint8_t src_industry; ///< Source industry substitute type. 0xFF for "town", 0xFE for "unknown".
uint8_t dst_industry; ///< Destination industry substitute type. 0xFF for "town", 0xFE for "unknown". uint8_t dst_industry; ///< Destination industry substitute type. 0xFF for "town", 0xFE for "unknown".
@ -203,7 +203,7 @@ static uint16_t GetGenericCallbackResult(uint8_t feature, ResolverObject &object
* @param[out] file Optionally returns the GRFFile which made the final decision for the callback result. May be nullptr if not required. * @param[out] file Optionally returns the GRFFile which made the final decision for the callback result. May be nullptr if not required.
* @return callback value if successful or CALLBACK_FAILED * @return callback value if successful or CALLBACK_FAILED
*/ */
uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoID cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size, const GRFFile **file) uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoType cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size, const GRFFile **file)
{ {
GenericResolverObject object(true, CBID_GENERIC_AI_PURCHASE_SELECTION); GenericResolverObject object(true, CBID_GENERIC_AI_PURCHASE_SELECTION);

2
src/newgrf_generic.h
View File

@ -47,7 +47,7 @@ static const IndustryType IT_AI_TOWN = 0xFF; ///< The AI actually wants to tr
void ResetGenericCallbacks(); void ResetGenericCallbacks();
void AddGenericCallback(uint8_t feature, const GRFFile *file, const SpriteGroup *group); void AddGenericCallback(uint8_t feature, const GRFFile *file, const SpriteGroup *group);
uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoID cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size, const GRFFile **file); uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoType cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size, const GRFFile **file);
void AmbientSoundEffectCallback(TileIndex tile); void AmbientSoundEffectCallback(TileIndex tile);
/** Play an ambient sound effect for an empty tile. */ /** Play an ambient sound effect for an empty tile. */

14
src/newgrf_house.cpp
View File

@ -446,8 +446,8 @@ static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex tile, Ho
/* Cargo acceptance history of nearby stations */ /* Cargo acceptance history of nearby stations */
case 0x64: { case 0x64: {
CargoID cid = GetCargoTranslation(parameter, this->ro.grffile); CargoType cargo_type = GetCargoTranslation(parameter, this->ro.grffile);
if (!IsValidCargoID(cid)) return 0; if (!IsValidCargoType(cargo_type)) return 0;
/* Extract tile offset. */ /* Extract tile offset. */
int8_t x_offs = GB(GetRegister(0x100), 0, 8); int8_t x_offs = GB(GetRegister(0x100), 0, 8);
@ -459,14 +459,14 @@ static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex tile, Ho
/* Collect acceptance stats. */ /* Collect acceptance stats. */
uint32_t res = 0; uint32_t res = 0;
for (Station *st : stations.GetStations()) { for (Station *st : stations.GetStations()) {
if (HasBit(st->goods[cid].status, GoodsEntry::GES_EVER_ACCEPTED)) SetBit(res, 0); if (HasBit(st->goods[cargo_type].status, GoodsEntry::GES_EVER_ACCEPTED)) SetBit(res, 0);
if (HasBit(st->goods[cid].status, GoodsEntry::GES_LAST_MONTH)) SetBit(res, 1); if (HasBit(st->goods[cargo_type].status, GoodsEntry::GES_LAST_MONTH)) SetBit(res, 1);
if (HasBit(st->goods[cid].status, GoodsEntry::GES_CURRENT_MONTH)) SetBit(res, 2); if (HasBit(st->goods[cargo_type].status, GoodsEntry::GES_CURRENT_MONTH)) SetBit(res, 2);
if (HasBit(st->goods[cid].status, GoodsEntry::GES_ACCEPTED_BIGTICK)) SetBit(res, 3); if (HasBit(st->goods[cargo_type].status, GoodsEntry::GES_ACCEPTED_BIGTICK)) SetBit(res, 3);
} }
/* Cargo triggered CB 148? */ /* Cargo triggered CB 148? */
if (HasBit(this->watched_cargo_triggers, cid)) SetBit(res, 4); if (HasBit(this->watched_cargo_triggers, cargo_type)) SetBit(res, 4);
return res; return res;
} }

14
src/newgrf_industries.cpp
View File

@ -322,8 +322,8 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_setID, uint8_
case 0x6D: case 0x6D:
case 0x70: case 0x70:
case 0x71: { case 0x71: {
CargoID cargo = GetCargoTranslation(parameter, this->ro.grffile); CargoType cargo = GetCargoTranslation(parameter, this->ro.grffile);
if (!IsValidCargoID(cargo)) return 0; if (!IsValidCargoType(cargo)) return 0;
auto it = this->industry->GetCargoProduced(cargo); auto it = this->industry->GetCargoProduced(cargo);
if (it == std::end(this->industry->produced)) return 0; // invalid cargo if (it == std::end(this->industry->produced)) return 0; // invalid cargo
switch (variable) { switch (variable) {
@ -341,8 +341,8 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_setID, uint8_
case 0x6E: case 0x6E:
case 0x6F: { case 0x6F: {
CargoID cargo = GetCargoTranslation(parameter, this->ro.grffile); CargoType cargo = GetCargoTranslation(parameter, this->ro.grffile);
if (!IsValidCargoID(cargo)) return 0; if (!IsValidCargoType(cargo)) return 0;
auto it = this->industry->GetCargoAccepted(cargo); auto it = this->industry->GetCargoAccepted(cargo);
if (it == std::end(this->industry->accepted)) return 0; // invalid cargo if (it == std::end(this->industry->accepted)) return 0; // invalid cargo
if (variable == 0x6E) return it->last_accepted.base(); if (variable == 0x6E) return it->last_accepted.base();
@ -644,11 +644,11 @@ void IndustryProductionCallback(Industry *ind, int reason)
if (group->version < 2) { if (group->version < 2) {
/* Callback parameters map directly to industry cargo slot indices */ /* Callback parameters map directly to industry cargo slot indices */
for (uint i = 0; i < group->num_input && i < ind->accepted.size(); i++) { for (uint i = 0; i < group->num_input && i < ind->accepted.size(); i++) {
if (!IsValidCargoID(ind->accepted[i].cargo)) continue; if (!IsValidCargoType(ind->accepted[i].cargo)) continue;
ind->accepted[i].waiting = ClampTo<uint16_t>(ind->accepted[i].waiting - DerefIndProd(group->subtract_input[i], deref) * multiplier); ind->accepted[i].waiting = ClampTo<uint16_t>(ind->accepted[i].waiting - DerefIndProd(group->subtract_input[i], deref) * multiplier);
} }
for (uint i = 0; i < group->num_output && i < ind->produced.size(); i++) { for (uint i = 0; i < group->num_output && i < ind->produced.size(); i++) {
if (!IsValidCargoID(ind->produced[i].cargo)) continue; if (!IsValidCargoType(ind->produced[i].cargo)) continue;
ind->produced[i].waiting = ClampTo<uint16_t>(ind->produced[i].waiting + std::max(DerefIndProd(group->add_output[i], deref), 0) * multiplier); ind->produced[i].waiting = ClampTo<uint16_t>(ind->produced[i].waiting + std::max(DerefIndProd(group->add_output[i], deref), 0) * multiplier);
} }
} else { } else {
@ -681,7 +681,7 @@ void IndustryProductionCallback(Industry *ind, int reason)
* @pre cargo_type is in ind->accepts_cargo. * @pre cargo_type is in ind->accepts_cargo.
* @return Whether the given industry refuses to accept this cargo type. * @return Whether the given industry refuses to accept this cargo type.
*/ */
bool IndustryTemporarilyRefusesCargo(Industry *ind, CargoID cargo_type) bool IndustryTemporarilyRefusesCargo(Industry *ind, CargoType cargo_type)
{ {
assert(ind->IsCargoAccepted(cargo_type)); assert(ind->IsCargoAccepted(cargo_type));

2
src/newgrf_industries.h
View File

@ -91,7 +91,7 @@ uint32_t GetIndustryIDAtOffset(TileIndex new_tile, const Industry *i, uint32_t c
void IndustryProductionCallback(Industry *ind, int reason); void IndustryProductionCallback(Industry *ind, int reason);
CommandCost CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, size_t layout, uint32_t seed, uint16_t initial_random_bits, Owner founder, IndustryAvailabilityCallType creation_type); CommandCost CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, size_t layout, uint32_t seed, uint16_t initial_random_bits, Owner founder, IndustryAvailabilityCallType creation_type);
uint32_t GetIndustryProbabilityCallback(IndustryType type, IndustryAvailabilityCallType creation_type, uint32_t default_prob); uint32_t GetIndustryProbabilityCallback(IndustryType type, IndustryAvailabilityCallType creation_type, uint32_t default_prob);
bool IndustryTemporarilyRefusesCargo(Industry *ind, CargoID cargo_type); bool IndustryTemporarilyRefusesCargo(Industry *ind, CargoType cargo_type);
IndustryType MapNewGRFIndustryType(IndustryType grf_type, uint32_t grf_id); IndustryType MapNewGRFIndustryType(IndustryType grf_type, uint32_t grf_id);

14
src/newgrf_roadstop.cpp
View File

@ -222,7 +222,7 @@ RoadStopResolverObject::RoadStopResolverObject(const RoadStopSpec *roadstopspec,
CallbackID callback, uint32_t param1, uint32_t param2) CallbackID callback, uint32_t param1, uint32_t param2)
: ResolverObject(roadstopspec->grf_prop.grffile, callback, param1, param2), roadstop_scope(*this, st, roadstopspec, tile, roadtype, type, view) : ResolverObject(roadstopspec->grf_prop.grffile, callback, param1, param2), roadstop_scope(*this, st, roadstopspec, tile, roadtype, type, view)
{ {
CargoID ctype = SpriteGroupCargo::SG_DEFAULT_NA; CargoType ctype = SpriteGroupCargo::SG_DEFAULT_NA;
if (st == nullptr) { if (st == nullptr) {
/* No station, so we are in a purchase list */ /* No station, so we are in a purchase list */
@ -365,7 +365,7 @@ void AnimateRoadStopTile(TileIndex tile)
RoadStopAnimationBase::AnimateTile(ss, BaseStation::GetByTile(tile), tile, HasBit(ss->flags, RSF_CB141_RANDOM_BITS)); RoadStopAnimationBase::AnimateTile(ss, BaseStation::GetByTile(tile), tile, HasBit(ss->flags, RSF_CB141_RANDOM_BITS));
} }
void TriggerRoadStopAnimation(BaseStation *st, TileIndex trigger_tile, StationAnimationTrigger trigger, CargoID cargo_type) void TriggerRoadStopAnimation(BaseStation *st, TileIndex trigger_tile, StationAnimationTrigger trigger, CargoType cargo_type)
{ {
/* Get Station if it wasn't supplied */ /* Get Station if it wasn't supplied */
if (st == nullptr) st = BaseStation::GetByTile(trigger_tile); if (st == nullptr) st = BaseStation::GetByTile(trigger_tile);
@ -378,8 +378,8 @@ void TriggerRoadStopAnimation(BaseStation *st, TileIndex trigger_tile, StationAn
auto process_tile = [&](TileIndex cur_tile) { auto process_tile = [&](TileIndex cur_tile) {
const RoadStopSpec *ss = GetRoadStopSpec(cur_tile); const RoadStopSpec *ss = GetRoadStopSpec(cur_tile);
if (ss != nullptr && HasBit(ss->animation.triggers, trigger)) { if (ss != nullptr && HasBit(ss->animation.triggers, trigger)) {
CargoID cargo; CargoType cargo;
if (!IsValidCargoID(cargo_type)) { if (!IsValidCargoType(cargo_type)) {
cargo = INVALID_CARGO; cargo = INVALID_CARGO;
} else { } else {
cargo = ss->grf_prop.grffile->cargo_map[cargo_type]; cargo = ss->grf_prop.grffile->cargo_map[cargo_type];
@ -405,14 +405,14 @@ void TriggerRoadStopAnimation(BaseStation *st, TileIndex trigger_tile, StationAn
* @param trigger trigger type * @param trigger trigger type
* @param cargo_type cargo type causing the trigger * @param cargo_type cargo type causing the trigger
*/ */
void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoID cargo_type) void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoType cargo_type)
{ {
if (st == nullptr) st = Station::GetByTile(tile); if (st == nullptr) st = Station::GetByTile(tile);
/* Check the cached cargo trigger bitmask to see if we need /* Check the cached cargo trigger bitmask to see if we need
* to bother with any further processing. */ * to bother with any further processing. */
if (st->cached_roadstop_cargo_triggers == 0) return; if (st->cached_roadstop_cargo_triggers == 0) return;
if (IsValidCargoID(cargo_type) && !HasBit(st->cached_roadstop_cargo_triggers, cargo_type)) return; if (IsValidCargoType(cargo_type) && !HasBit(st->cached_roadstop_cargo_triggers, cargo_type)) return;
SetBit(st->waiting_triggers, trigger); SetBit(st->waiting_triggers, trigger);
@ -432,7 +432,7 @@ void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTri
if ((ss->cargo_triggers & ~empty_mask) != 0) return; if ((ss->cargo_triggers & ~empty_mask) != 0) return;
} }
if (!IsValidCargoID(cargo_type) || HasBit(ss->cargo_triggers, cargo_type)) { if (!IsValidCargoType(cargo_type) || HasBit(ss->cargo_triggers, cargo_type)) {
RoadStopResolverObject object(ss, st, cur_tile, INVALID_ROADTYPE, GetStationType(cur_tile), GetStationGfx(cur_tile)); RoadStopResolverObject object(ss, st, cur_tile, INVALID_ROADTYPE, GetStationType(cur_tile), GetStationGfx(cur_tile));
object.waiting_triggers = st->waiting_triggers; object.waiting_triggers = st->waiting_triggers;

6
src/newgrf_roadstop.h
View File

@ -90,7 +90,7 @@ struct RoadStopScopeResolver : public ScopeResolver {
TileIndex tile; ///< %Tile of the station. TileIndex tile; ///< %Tile of the station.
struct BaseStation *st; ///< Instance of the station. struct BaseStation *st; ///< Instance of the station.
const struct RoadStopSpec *roadstopspec; ///< Station (type) specification. const struct RoadStopSpec *roadstopspec; ///< Station (type) specification.
CargoID cargo_type; ///< Type of cargo of the station. CargoType cargo_type; ///< Type of cargo of the station.
StationType type; ///< Station type. StationType type; ///< Station type.
uint8_t view; ///< Station axis. uint8_t view; ///< Station axis.
RoadType roadtype; ///< Road type (used when no tile) RoadType roadtype; ///< Road type (used when no tile)
@ -180,8 +180,8 @@ uint16_t GetRoadStopCallback(CallbackID callback, uint32_t param1, uint32_t para
void AnimateRoadStopTile(TileIndex tile); void AnimateRoadStopTile(TileIndex tile);
uint8_t GetRoadStopTileAnimationSpeed(TileIndex tile); uint8_t GetRoadStopTileAnimationSpeed(TileIndex tile);
void TriggerRoadStopAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoID cargo_type = INVALID_CARGO); void TriggerRoadStopAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoID cargo_type = INVALID_CARGO); void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoType cargo_type = INVALID_CARGO);
bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype); bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype);
bool GetIfClassHasNewStopsByType(const RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype); bool GetIfClassHasNewStopsByType(const RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype);

4
src/newgrf_spritegroup.h
View File

@ -260,10 +260,10 @@ struct IndustryProductionSpriteGroup : SpriteGroup {
uint8_t version; ///< Production callback version used, or 0xFF if marked invalid uint8_t version; ///< Production callback version used, or 0xFF if marked invalid
uint8_t num_input; ///< How many subtract_input values are valid uint8_t num_input; ///< How many subtract_input values are valid
int16_t subtract_input[INDUSTRY_NUM_INPUTS]; ///< Take this much of the input cargo (can be negative, is indirect in cb version 1+) int16_t subtract_input[INDUSTRY_NUM_INPUTS]; ///< Take this much of the input cargo (can be negative, is indirect in cb version 1+)
CargoID cargo_input[INDUSTRY_NUM_INPUTS]; ///< Which input cargoes to take from (only cb version 2) CargoType cargo_input[INDUSTRY_NUM_INPUTS]; ///< Which input cargoes to take from (only cb version 2)
uint8_t num_output; ///< How many add_output values are valid uint8_t num_output; ///< How many add_output values are valid
uint16_t add_output[INDUSTRY_NUM_OUTPUTS]; ///< Add this much output cargo when successful (unsigned, is indirect in cb version 1+) uint16_t add_output[INDUSTRY_NUM_OUTPUTS]; ///< Add this much output cargo when successful (unsigned, is indirect in cb version 1+)
CargoID cargo_output[INDUSTRY_NUM_OUTPUTS]; ///< Which output cargoes to add to (only cb version 2) CargoType cargo_output[INDUSTRY_NUM_OUTPUTS]; ///< Which output cargoes to add to (only cb version 2)
uint8_t again; uint8_t again;
}; };

18
src/newgrf_station.cpp
View File

@ -422,9 +422,9 @@ uint32_t Station::GetNewGRFVariable(const ResolverObject &object, uint8_t variab
/* Handle cargo variables with parameter, 0x60 to 0x65 and 0x69 */ /* Handle cargo variables with parameter, 0x60 to 0x65 and 0x69 */
if ((variable >= 0x60 && variable <= 0x65) || variable == 0x69) { if ((variable >= 0x60 && variable <= 0x65) || variable == 0x69) {
CargoID c = GetCargoTranslation(parameter, object.grffile); CargoType c = GetCargoTranslation(parameter, object.grffile);
if (!IsValidCargoID(c)) { if (!IsValidCargoType(c)) {
switch (variable) { switch (variable) {
case 0x62: return 0xFFFFFFFF; case 0x62: return 0xFFFFFFFF;
case 0x64: return 0xFF00; case 0x64: return 0xFF00;
@ -577,7 +577,7 @@ StationResolverObject::StationResolverObject(const StationSpec *statspec, BaseSt
/* Invalidate all cached vars */ /* Invalidate all cached vars */
_svc.valid = 0; _svc.valid = 0;
CargoID ctype = SpriteGroupCargo::SG_DEFAULT_NA; CargoType ctype = SpriteGroupCargo::SG_DEFAULT_NA;
if (this->station_scope.st == nullptr) { if (this->station_scope.st == nullptr) {
/* No station, so we are in a purchase list */ /* No station, so we are in a purchase list */
@ -878,7 +878,7 @@ void AnimateStationTile(TileIndex tile)
StationAnimationBase::AnimateTile(ss, BaseStation::GetByTile(tile), tile, HasBit(ss->flags, SSF_CB141_RANDOM_BITS)); StationAnimationBase::AnimateTile(ss, BaseStation::GetByTile(tile), tile, HasBit(ss->flags, SSF_CB141_RANDOM_BITS));
} }
void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAnimationTrigger trigger, CargoID cargo_type) void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAnimationTrigger trigger, CargoType cargo_type)
{ {
/* List of coverage areas for each animation trigger */ /* List of coverage areas for each animation trigger */
static const TriggerArea tas[] = { static const TriggerArea tas[] = {
@ -900,8 +900,8 @@ void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAni
if (st->TileBelongsToRailStation(tile)) { if (st->TileBelongsToRailStation(tile)) {
const StationSpec *ss = GetStationSpec(tile); const StationSpec *ss = GetStationSpec(tile);
if (ss != nullptr && HasBit(ss->animation.triggers, trigger)) { if (ss != nullptr && HasBit(ss->animation.triggers, trigger)) {
CargoID cargo; CargoType cargo;
if (!IsValidCargoID(cargo_type)) { if (!IsValidCargoType(cargo_type)) {
cargo = INVALID_CARGO; cargo = INVALID_CARGO;
} else { } else {
cargo = ss->grf_prop.grffile->cargo_map[cargo_type]; cargo = ss->grf_prop.grffile->cargo_map[cargo_type];
@ -919,7 +919,7 @@ void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAni
* @param trigger trigger type * @param trigger trigger type
* @param cargo_type cargo type causing trigger * @param cargo_type cargo type causing trigger
*/ */
void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRandomTrigger trigger, CargoID cargo_type) void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRandomTrigger trigger, CargoType cargo_type)
{ {
/* List of coverage areas for each animation trigger */ /* List of coverage areas for each animation trigger */
static const TriggerArea tas[] = { static const TriggerArea tas[] = {
@ -932,7 +932,7 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
/* Check the cached cargo trigger bitmask to see if we need /* Check the cached cargo trigger bitmask to see if we need
* to bother with any further processing. */ * to bother with any further processing. */
if (st->cached_cargo_triggers == 0) return; if (st->cached_cargo_triggers == 0) return;
if (IsValidCargoID(cargo_type) && !HasBit(st->cached_cargo_triggers, cargo_type)) return; if (IsValidCargoType(cargo_type) && !HasBit(st->cached_cargo_triggers, cargo_type)) return;
uint32_t whole_reseed = 0; uint32_t whole_reseed = 0;
ETileArea area = ETileArea(st, trigger_tile, tas[trigger]); ETileArea area = ETileArea(st, trigger_tile, tas[trigger]);
@ -956,7 +956,7 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
if ((ss->cargo_triggers & ~empty_mask) != 0) continue; if ((ss->cargo_triggers & ~empty_mask) != 0) continue;
} }
if (!IsValidCargoID(cargo_type) || HasBit(ss->cargo_triggers, cargo_type)) { if (!IsValidCargoType(cargo_type) || HasBit(ss->cargo_triggers, cargo_type)) {
StationResolverObject object(ss, st, tile, CBID_RANDOM_TRIGGER, 0); StationResolverObject object(ss, st, tile, CBID_RANDOM_TRIGGER, 0);
object.waiting_triggers = st->waiting_triggers; object.waiting_triggers = st->waiting_triggers;

6
src/newgrf_station.h
View File

@ -26,7 +26,7 @@ struct StationScopeResolver : public ScopeResolver {
TileIndex tile; ///< %Tile of the station. TileIndex tile; ///< %Tile of the station.
struct BaseStation *st; ///< Instance of the station. struct BaseStation *st; ///< Instance of the station.
const struct StationSpec *statspec; ///< Station (type) specification. const struct StationSpec *statspec; ///< Station (type) specification.
CargoID cargo_type; ///< Type of cargo of the station. CargoType cargo_type; ///< Type of cargo of the station.
Axis axis; ///< Station axis, used only for the slope check callback. Axis axis; ///< Station axis, used only for the slope check callback.
/** /**
@ -219,8 +219,8 @@ void DeallocateSpecFromStation(BaseStation *st, uint8_t specindex);
bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID sclass, uint station); bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID sclass, uint station);
void AnimateStationTile(TileIndex tile); void AnimateStationTile(TileIndex tile);
void TriggerStationAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoID cargo_type = INVALID_CARGO); void TriggerStationAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigger trigger, CargoID cargo_type = INVALID_CARGO); void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigger trigger, CargoType cargo_type = INVALID_CARGO);
void StationUpdateCachedTriggers(BaseStation *st); void StationUpdateCachedTriggers(BaseStation *st);
#endif /* NEWGRF_STATION_H */ #endif /* NEWGRF_STATION_H */

2
src/newgrf_text.cpp
View File

@ -924,7 +924,7 @@ char32_t RemapNewGRFStringControlCode(char32_t scc, const char **str, StringPara
break; break;
case SCC_NEWGRF_PRINT_WORD_CARGO_NAME: { case SCC_NEWGRF_PRINT_WORD_CARGO_NAME: {
CargoID cargo = GetCargoTranslation(_newgrf_textrefstack.PopUnsignedWord(), _newgrf_textrefstack.grffile); CargoType cargo = GetCargoTranslation(_newgrf_textrefstack.PopUnsignedWord(), _newgrf_textrefstack.grffile);
parameters.SetParam(0, cargo < NUM_CARGO ? 1ULL << cargo : 0); parameters.SetParam(0, cargo < NUM_CARGO ? 1ULL << cargo : 0);
break; break;
} }

38
src/newgrf_town.cpp
View File

@ -22,7 +22,7 @@
return UINT_MAX; return UINT_MAX;
} }
CargoID cid; CargoType cargo_type;
switch (variable) { switch (variable) {
/* Larger towns */ /* Larger towns */
case 0x40: case 0x40:
@ -87,24 +87,24 @@
case 0xB2: return this->t->statues; case 0xB2: return this->t->statues;
case 0xB6: return ClampTo<uint16_t>(this->t->cache.num_houses); case 0xB6: return ClampTo<uint16_t>(this->t->cache.num_houses);
case 0xB9: return this->t->growth_rate / Ticks::TOWN_GROWTH_TICKS; case 0xB9: return this->t->growth_rate / Ticks::TOWN_GROWTH_TICKS;
case 0xBA: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].new_max) : 0; case 0xBA: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].new_max) : 0;
case 0xBB: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].new_max), 8, 8) : 0; case 0xBB: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].new_max), 8, 8) : 0;
case 0xBC: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].new_max) : 0; case 0xBC: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].new_max) : 0;
case 0xBD: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].new_max), 8, 8) : 0; case 0xBD: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].new_max), 8, 8) : 0;
case 0xBE: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].new_act) : 0; case 0xBE: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].new_act) : 0;
case 0xBF: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].new_act), 8, 8) : 0; case 0xBF: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].new_act), 8, 8) : 0;
case 0xC0: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].new_act) : 0; case 0xC0: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].new_act) : 0;
case 0xC1: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].new_act), 8, 8) : 0; case 0xC1: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].new_act), 8, 8) : 0;
case 0xC2: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].old_max) : 0; case 0xC2: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].old_max) : 0;
case 0xC3: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].old_max), 8, 8) : 0; case 0xC3: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].old_max), 8, 8) : 0;
case 0xC4: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].old_max) : 0; case 0xC4: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].old_max) : 0;
case 0xC5: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].old_max), 8, 8) : 0; case 0xC5: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].old_max), 8, 8) : 0;
case 0xC6: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].old_act) : 0; case 0xC6: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].old_act) : 0;
case 0xC7: cid = GetCargoIDByLabel(CT_PASSENGERS); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].old_act), 8, 8) : 0; case 0xC7: cargo_type = GetCargoTypeByLabel(CT_PASSENGERS); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].old_act), 8, 8) : 0;
case 0xC8: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? ClampTo<uint16_t>(this->t->supplied[cid].old_act) : 0; case 0xC8: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? ClampTo<uint16_t>(this->t->supplied[cargo_type].old_act) : 0;
case 0xC9: cid = GetCargoIDByLabel(CT_MAIL); return IsValidCargoID(cid) ? GB(ClampTo<uint16_t>(this->t->supplied[cid].old_act), 8, 8) : 0; case 0xC9: cargo_type = GetCargoTypeByLabel(CT_MAIL); return IsValidCargoType(cargo_type) ? GB(ClampTo<uint16_t>(this->t->supplied[cargo_type].old_act), 8, 8) : 0;
case 0xCA: return this->t->GetPercentTransported(GetCargoIDByLabel(CT_PASSENGERS)); case 0xCA: return this->t->GetPercentTransported(GetCargoTypeByLabel(CT_PASSENGERS));
case 0xCB: return this->t->GetPercentTransported(GetCargoIDByLabel(CT_MAIL)); case 0xCB: return this->t->GetPercentTransported(GetCargoTypeByLabel(CT_MAIL));
case 0xCC: return this->t->received[TAE_FOOD].new_act; case 0xCC: return this->t->received[TAE_FOOD].new_act;
case 0xCD: return GB(this->t->received[TAE_FOOD].new_act, 8, 8); case 0xCD: return GB(this->t->received[TAE_FOOD].new_act, 8, 8);
case 0xCE: return this->t->received[TAE_WATER].new_act; case 0xCE: return this->t->received[TAE_WATER].new_act;

24
src/object_cmd.cpp
View File

@ -630,8 +630,8 @@ static void AddAcceptedCargo_Object(TileIndex tile, CargoArray &acceptance, Carg
/* Top town building generates 10, so to make HQ interesting, the top /* Top town building generates 10, so to make HQ interesting, the top
* type makes 20. */ * type makes 20. */
CargoID pass = GetCargoIDByLabel(CT_PASSENGERS); CargoType pass = GetCargoTypeByLabel(CT_PASSENGERS);
if (IsValidCargoID(pass)) { if (IsValidCargoType(pass)) {
acceptance[pass] += std::max(1U, level); acceptance[pass] += std::max(1U, level);
SetBit(always_accepted, pass); SetBit(always_accepted, pass);
} }
@ -640,8 +640,8 @@ static void AddAcceptedCargo_Object(TileIndex tile, CargoArray &acceptance, Carg
* proportion passengers:mail is different because such a huge * proportion passengers:mail is different because such a huge
* commercial building generates unusually high amount of mail * commercial building generates unusually high amount of mail
* correspondence per physical visitor. */ * correspondence per physical visitor. */
CargoID mail = GetCargoIDByLabel(CT_MAIL); CargoType mail = GetCargoTypeByLabel(CT_MAIL);
if (IsValidCargoID(mail)) { if (IsValidCargoType(mail)) {
acceptance[mail] += std::max(1U, level / 2); acceptance[mail] += std::max(1U, level / 2);
SetBit(always_accepted, mail); SetBit(always_accepted, mail);
} }
@ -651,10 +651,10 @@ static void AddProducedCargo_Object(TileIndex tile, CargoArray &produced)
{ {
if (!IsObjectType(tile, OBJECT_HQ)) return; if (!IsObjectType(tile, OBJECT_HQ)) return;
CargoID pass = GetCargoIDByLabel(CT_PASSENGERS); CargoType pass = GetCargoTypeByLabel(CT_PASSENGERS);
if (IsValidCargoID(pass)) produced[pass]++; if (IsValidCargoType(pass)) produced[pass]++;
CargoID mail = GetCargoIDByLabel(CT_MAIL); CargoType mail = GetCargoTypeByLabel(CT_MAIL);
if (IsValidCargoID(mail)) produced[mail]++; if (IsValidCargoType(mail)) produced[mail]++;
} }
@ -694,8 +694,8 @@ static void TileLoop_Object(TileIndex tile)
uint r = Random(); uint r = Random();
/* Top town buildings generate 250, so the top HQ type makes 256. */ /* Top town buildings generate 250, so the top HQ type makes 256. */
CargoID pass = GetCargoIDByLabel(CT_PASSENGERS); CargoType pass = GetCargoTypeByLabel(CT_PASSENGERS);
if (IsValidCargoID(pass) && GB(r, 0, 8) < (256 / 4 / (6 - level))) { if (IsValidCargoType(pass) && GB(r, 0, 8) < (256 / 4 / (6 - level))) {
uint amt = GB(r, 0, 8) / 8 / 4 + 1; uint amt = GB(r, 0, 8) / 8 / 4 + 1;
/* Production is halved during recessions. */ /* Production is halved during recessions. */
@ -710,8 +710,8 @@ static void TileLoop_Object(TileIndex tile)
/* Top town building generates 90, HQ can make up to 196. The /* Top town building generates 90, HQ can make up to 196. The
* proportion passengers:mail is about the same as in the acceptance * proportion passengers:mail is about the same as in the acceptance
* equations. */ * equations. */
CargoID mail = GetCargoIDByLabel(CT_MAIL); CargoType mail = GetCargoTypeByLabel(CT_MAIL);
if (IsValidCargoID(mail) && GB(r, 8, 8) < (196 / 4 / (6 - level))) { if (IsValidCargoType(mail) && GB(r, 8, 8) < (196 / 4 / (6 - level))) {
uint amt = GB(r, 8, 8) / 8 / 4 + 1; uint amt = GB(r, 8, 8) / 8 / 4 + 1;
/* Production is halved during recessions. */ /* Production is halved during recessions. */

8
src/order_base.h
View File

@ -49,7 +49,7 @@ private:
uint8_t flags = 0; ///< Load/unload types, depot order/action types. uint8_t flags = 0; ///< Load/unload types, depot order/action types.
DestinationID dest = 0; ///< The destination of the order. DestinationID dest = 0; ///< The destination of the order.
CargoID refit_cargo = CARGO_NO_REFIT; ///< Refit CargoID CargoType refit_cargo = CARGO_NO_REFIT; ///< Refit CargoType
uint16_t wait_time = 0; ///< How long in ticks to wait at the destination. uint16_t wait_time = 0; ///< How long in ticks to wait at the destination.
uint16_t travel_time = 0; ///< How long in ticks the journey to this destination should take. uint16_t travel_time = 0; ///< How long in ticks the journey to this destination should take.
@ -78,7 +78,7 @@ public:
void Free(); void Free();
void MakeGoToStation(StationID destination); void MakeGoToStation(StationID destination);
void MakeGoToDepot(DepotID destination, OrderDepotTypeFlags order, OrderNonStopFlags non_stop_type = ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS, OrderDepotActionFlags action = ODATF_SERVICE_ONLY, CargoID cargo = CARGO_NO_REFIT); void MakeGoToDepot(DepotID destination, OrderDepotTypeFlags order, OrderNonStopFlags non_stop_type = ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS, OrderDepotActionFlags action = ODATF_SERVICE_ONLY, CargoType cargo = CARGO_NO_REFIT);
void MakeGoToWaypoint(StationID destination); void MakeGoToWaypoint(StationID destination);
void MakeLoading(bool ordered); void MakeLoading(bool ordered);
void MakeLeaveStation(); void MakeLeaveStation();
@ -128,9 +128,9 @@ public:
* @pre IsType(OT_GOTO_DEPOT) || IsType(OT_GOTO_STATION) * @pre IsType(OT_GOTO_DEPOT) || IsType(OT_GOTO_STATION)
* @return the cargo type. * @return the cargo type.
*/ */
inline CargoID GetRefitCargo() const { return this->refit_cargo; } inline CargoType GetRefitCargo() const { return this->refit_cargo; }
void SetRefit(CargoID cargo); void SetRefit(CargoType cargo);
/** How must the consist be loaded? */ /** How must the consist be loaded? */
inline OrderLoadFlags GetLoadType() const { return (OrderLoadFlags)GB(this->flags, 4, 3); } inline OrderLoadFlags GetLoadType() const { return (OrderLoadFlags)GB(this->flags, 4, 3); }

8
src/order_cmd.cpp
View File

@ -87,7 +87,7 @@ void Order::MakeGoToStation(StationID destination)
* @param action what to do in the depot? * @param action what to do in the depot?
* @param cargo the cargo type to change to. * @param cargo the cargo type to change to.
*/ */
void Order::MakeGoToDepot(DepotID destination, OrderDepotTypeFlags order, OrderNonStopFlags non_stop_type, OrderDepotActionFlags action, CargoID cargo) void Order::MakeGoToDepot(DepotID destination, OrderDepotTypeFlags order, OrderNonStopFlags non_stop_type, OrderDepotActionFlags action, CargoType cargo)
{ {
this->type = OT_GOTO_DEPOT; this->type = OT_GOTO_DEPOT;
this->SetDepotOrderType(order); this->SetDepotOrderType(order);
@ -162,7 +162,7 @@ void Order::MakeImplicit(StationID destination)
* @param cargo the cargo type to change to. * @param cargo the cargo type to change to.
* @pre IsType(OT_GOTO_DEPOT) || IsType(OT_GOTO_STATION). * @pre IsType(OT_GOTO_DEPOT) || IsType(OT_GOTO_STATION).
*/ */
void Order::SetRefit(CargoID cargo) void Order::SetRefit(CargoType cargo)
{ {
this->refit_cargo = cargo; this->refit_cargo = cargo;
} }
@ -1654,10 +1654,10 @@ CommandCost CmdCloneOrder(DoCommandFlag flags, CloneOptions action, VehicleID ve
* @param flags operation to perform * @param flags operation to perform
* @param veh VehicleIndex of the vehicle having the order * @param veh VehicleIndex of the vehicle having the order
* @param order_number number of order to modify * @param order_number number of order to modify
* @param cargo CargoID * @param cargo CargoType
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdOrderRefit(DoCommandFlag flags, VehicleID veh, VehicleOrderID order_number, CargoID cargo) CommandCost CmdOrderRefit(DoCommandFlag flags, VehicleID veh, VehicleOrderID order_number, CargoType cargo)
{ {
if (cargo >= NUM_CARGO && cargo != CARGO_NO_REFIT && cargo != CARGO_AUTO_REFIT) return CMD_ERROR; if (cargo >= NUM_CARGO && cargo != CARGO_NO_REFIT && cargo != CARGO_AUTO_REFIT) return CMD_ERROR;

2
src/order_cmd.h
View File

@ -18,7 +18,7 @@ CommandCost CmdModifyOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID se
CommandCost CmdSkipToOrder(DoCommandFlag flags, VehicleID veh_id, VehicleOrderID sel_ord); CommandCost CmdSkipToOrder(DoCommandFlag flags, VehicleID veh_id, VehicleOrderID sel_ord);
CommandCost CmdDeleteOrder(DoCommandFlag flags, VehicleID veh_id, VehicleOrderID sel_ord); CommandCost CmdDeleteOrder(DoCommandFlag flags, VehicleID veh_id, VehicleOrderID sel_ord);
CommandCost CmdInsertOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID sel_ord, const Order &new_order); CommandCost CmdInsertOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID sel_ord, const Order &new_order);
CommandCost CmdOrderRefit(DoCommandFlag flags, VehicleID veh, VehicleOrderID order_number, CargoID cargo); CommandCost CmdOrderRefit(DoCommandFlag flags, VehicleID veh, VehicleOrderID order_number, CargoType cargo);
CommandCost CmdCloneOrder(DoCommandFlag flags, CloneOptions action, VehicleID veh_dst, VehicleID veh_src); CommandCost CmdCloneOrder(DoCommandFlag flags, CloneOptions action, VehicleID veh_dst, VehicleID veh_src);
CommandCost CmdMoveOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID moving_order, VehicleOrderID target_order); CommandCost CmdMoveOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID moving_order, VehicleOrderID target_order);
CommandCost CmdClearOrderBackup(DoCommandFlag flags, TileIndex tile, ClientID user_id); CommandCost CmdClearOrderBackup(DoCommandFlag flags, TileIndex tile, ClientID user_id);

2
src/roadveh_cmd.cpp
View File

@ -285,7 +285,7 @@ CommandCost CmdBuildRoadVehicle(DoCommandFlag flags, TileIndex tile, const Engin
v->spritenum = rvi->image_index; v->spritenum = rvi->image_index;
v->cargo_type = e->GetDefaultCargoType(); v->cargo_type = e->GetDefaultCargoType();
assert(IsValidCargoID(v->cargo_type)); assert(IsValidCargoType(v->cargo_type));
v->cargo_cap = rvi->capacity; v->cargo_cap = rvi->capacity;
v->refit_cap = 0; v->refit_cap = 0;

12
src/roadveh_gui.cpp
View File

@ -55,16 +55,16 @@ void DrawRoadVehDetails(const Vehicle *v, const Rect &r)
bool first = true; bool first = true;
for (const CargoSpec *cs : _sorted_cargo_specs) { for (const CargoSpec *cs : _sorted_cargo_specs) {
CargoID cid = cs->Index(); CargoType cargo_type = cs->Index();
if (max_cargo[cid] > 0) { if (max_cargo[cargo_type] > 0) {
if (!first) capacity += list_separator; if (!first) capacity += list_separator;
SetDParam(0, cid); SetDParam(0, cargo_type);
SetDParam(1, max_cargo[cid]); SetDParam(1, max_cargo[cargo_type]);
AppendStringInPlace(capacity, STR_JUST_CARGO); AppendStringInPlace(capacity, STR_JUST_CARGO);
if (subtype_text[cid] != STR_NULL) { if (subtype_text[cargo_type] != STR_NULL) {
AppendStringInPlace(capacity, subtype_text[cid]); AppendStringInPlace(capacity, subtype_text[cargo_type]);
} }
first = false; first = false;

2
src/saveload/afterload.cpp
View File

@ -3081,7 +3081,7 @@ bool AfterLoadGame()
/* Make sure last_cargo_accepted_at is copied to elements for every valid input cargo. /* Make sure last_cargo_accepted_at is copied to elements for every valid input cargo.
* The loading routine should put the original singular value into the first array element. */ * The loading routine should put the original singular value into the first array element. */
for (auto &a : i->accepted) { for (auto &a : i->accepted) {
if (IsValidCargoID(a.cargo)) { if (IsValidCargoType(a.cargo)) {
a.last_accepted = i->GetAccepted(0).last_accepted; a.last_accepted = i->GetAccepted(0).last_accepted;
} else { } else {
a.last_accepted = EconomyTime::MIN_DATE; a.last_accepted = EconomyTime::MIN_DATE;

6
src/saveload/industry_sl.cpp
View File

@ -31,7 +31,7 @@ public:
std::vector<Industry::AcceptedCargo> &GetVector(Industry *i) const override { return i->accepted; } std::vector<Industry::AcceptedCargo> &GetVector(Industry *i) const override { return i->accepted; }
/* Old array structure used by INDYChunkHandler for savegames before SLV_INDUSTRY_CARGO_REORGANISE. */ /* Old array structure used by INDYChunkHandler for savegames before SLV_INDUSTRY_CARGO_REORGANISE. */
static inline std::array<CargoID, INDUSTRY_NUM_INPUTS> old_cargo; static inline std::array<CargoType, INDUSTRY_NUM_INPUTS> old_cargo;
static inline std::array<uint16_t, INDUSTRY_NUM_INPUTS> old_waiting; static inline std::array<uint16_t, INDUSTRY_NUM_INPUTS> old_waiting;
static inline std::array<TimerGameEconomy::Date, INDUSTRY_NUM_INPUTS> old_last_accepted; static inline std::array<TimerGameEconomy::Date, INDUSTRY_NUM_INPUTS> old_last_accepted;
@ -53,7 +53,7 @@ public:
void Save(Industry::ProducedCargo *p) const override void Save(Industry::ProducedCargo *p) const override
{ {
if (!IsValidCargoID(p->cargo)) { if (!IsValidCargoType(p->cargo)) {
/* Don't save any history if cargo slot isn't used. */ /* Don't save any history if cargo slot isn't used. */
SlSetStructListLength(0); SlSetStructListLength(0);
return; return;
@ -90,7 +90,7 @@ public:
std::vector<Industry::ProducedCargo> &GetVector(Industry *i) const override { return i->produced; } std::vector<Industry::ProducedCargo> &GetVector(Industry *i) const override { return i->produced; }
/* Old array structure used by INDYChunkHandler for savegames before SLV_INDUSTRY_CARGO_REORGANISE. */ /* Old array structure used by INDYChunkHandler for savegames before SLV_INDUSTRY_CARGO_REORGANISE. */
static inline std::array<CargoID, INDUSTRY_NUM_OUTPUTS> old_cargo; static inline std::array<CargoType, INDUSTRY_NUM_OUTPUTS> old_cargo;
static inline std::array<uint16_t, INDUSTRY_NUM_OUTPUTS> old_waiting; static inline std::array<uint16_t, INDUSTRY_NUM_OUTPUTS> old_waiting;
static inline std::array<uint8_t, INDUSTRY_NUM_OUTPUTS> old_rate; static inline std::array<uint8_t, INDUSTRY_NUM_OUTPUTS> old_rate;
static inline std::array<uint16_t, INDUSTRY_NUM_OUTPUTS> old_this_month_production; static inline std::array<uint16_t, INDUSTRY_NUM_OUTPUTS> old_this_month_production;

2
src/saveload/oldloader_sl.cpp
View File

@ -1463,7 +1463,7 @@ static bool LoadOldSubsidy(LoadgameState *ls, int num)
{ {
Subsidy *s = new (num) Subsidy(); Subsidy *s = new (num) Subsidy();
bool ret = LoadChunk(ls, s, subsidy_chunk); bool ret = LoadChunk(ls, s, subsidy_chunk);
if (!IsValidCargoID(s->cargo_type)) delete s; if (!IsValidCargoType(s->cargo_type)) delete s;
return ret; return ret;
} }

18
src/script/api/script_cargo.cpp
View File

@ -18,7 +18,7 @@
#include "../../safeguards.h" #include "../../safeguards.h"
/* static */ bool ScriptCargo::IsValidCargo(CargoID cargo_type) /* static */ bool ScriptCargo::IsValidCargo(CargoType cargo_type)
{ {
return (cargo_type < NUM_CARGO && ::CargoSpec::Get(cargo_type)->IsValid()); return (cargo_type < NUM_CARGO && ::CargoSpec::Get(cargo_type)->IsValid());
} }
@ -28,7 +28,7 @@
return (towneffect_type >= (TownEffect)TAE_BEGIN && towneffect_type < (TownEffect)TAE_END); return (towneffect_type >= (TownEffect)TAE_BEGIN && towneffect_type < (TownEffect)TAE_END);
} }
/* static */ std::optional<std::string> ScriptCargo::GetName(CargoID cargo_type) /* static */ std::optional<std::string> ScriptCargo::GetName(CargoType cargo_type)
{ {
if (!IsValidCargo(cargo_type)) return std::nullopt; if (!IsValidCargo(cargo_type)) return std::nullopt;
@ -36,7 +36,7 @@
return GetString(STR_JUST_CARGO_LIST); return GetString(STR_JUST_CARGO_LIST);
} }
/* static */ std::optional<std::string> ScriptCargo::GetCargoLabel(CargoID cargo_type) /* static */ std::optional<std::string> ScriptCargo::GetCargoLabel(CargoType cargo_type)
{ {
if (!IsValidCargo(cargo_type)) return std::nullopt; if (!IsValidCargo(cargo_type)) return std::nullopt;
const CargoSpec *cargo = ::CargoSpec::Get(cargo_type); const CargoSpec *cargo = ::CargoSpec::Get(cargo_type);
@ -50,27 +50,27 @@
return cargo_label; return cargo_label;
} }
/* static */ bool ScriptCargo::IsFreight(CargoID cargo_type) /* static */ bool ScriptCargo::IsFreight(CargoType cargo_type)
{ {
if (!IsValidCargo(cargo_type)) return false; if (!IsValidCargo(cargo_type)) return false;
const CargoSpec *cargo = ::CargoSpec::Get(cargo_type); const CargoSpec *cargo = ::CargoSpec::Get(cargo_type);
return cargo->is_freight; return cargo->is_freight;
} }
/* static */ bool ScriptCargo::HasCargoClass(CargoID cargo_type, CargoClass cargo_class) /* static */ bool ScriptCargo::HasCargoClass(CargoType cargo_type, CargoClass cargo_class)
{ {
if (!IsValidCargo(cargo_type)) return false; if (!IsValidCargo(cargo_type)) return false;
return ::IsCargoInClass(cargo_type, (::CargoClass)cargo_class); return ::IsCargoInClass(cargo_type, (::CargoClass)cargo_class);
} }
/* static */ ScriptCargo::TownEffect ScriptCargo::GetTownEffect(CargoID cargo_type) /* static */ ScriptCargo::TownEffect ScriptCargo::GetTownEffect(CargoType cargo_type)
{ {
if (!IsValidCargo(cargo_type)) return TE_NONE; if (!IsValidCargo(cargo_type)) return TE_NONE;
return (ScriptCargo::TownEffect)::CargoSpec::Get(cargo_type)->town_acceptance_effect; return (ScriptCargo::TownEffect)::CargoSpec::Get(cargo_type)->town_acceptance_effect;
} }
/* static */ Money ScriptCargo::GetCargoIncome(CargoID cargo_type, SQInteger distance, SQInteger days_in_transit) /* static */ Money ScriptCargo::GetCargoIncome(CargoType cargo_type, SQInteger distance, SQInteger days_in_transit)
{ {
if (!IsValidCargo(cargo_type)) return -1; if (!IsValidCargo(cargo_type)) return -1;
@ -79,13 +79,13 @@
return ::GetTransportedGoodsIncome(1, distance, Clamp(days_in_transit * 2 / 5, 0, UINT16_MAX), cargo_type); return ::GetTransportedGoodsIncome(1, distance, Clamp(days_in_transit * 2 / 5, 0, UINT16_MAX), cargo_type);
} }
/* static */ ScriptCargo::DistributionType ScriptCargo::GetDistributionType(CargoID cargo_type) /* static */ ScriptCargo::DistributionType ScriptCargo::GetDistributionType(CargoType cargo_type)
{ {
if (!ScriptCargo::IsValidCargo(cargo_type)) return INVALID_DISTRIBUTION_TYPE; if (!ScriptCargo::IsValidCargo(cargo_type)) return INVALID_DISTRIBUTION_TYPE;
return (ScriptCargo::DistributionType)_settings_game.linkgraph.GetDistributionType(cargo_type); return (ScriptCargo::DistributionType)_settings_game.linkgraph.GetDistributionType(cargo_type);
} }
/* static */ SQInteger ScriptCargo::GetWeight(CargoID cargo_type, SQInteger amount) /* static */ SQInteger ScriptCargo::GetWeight(CargoType cargo_type, SQInteger amount)
{ {
if (!IsValidCargo(cargo_type)) return -1; if (!IsValidCargo(cargo_type)) return -1;

20
src/script/api/script_cargo.hpp
View File

@ -53,7 +53,7 @@ public:
/** /**
* Special cargo types. * Special cargo types.
*/ */
enum SpecialCargoID { enum SpecialCargoType {
/* Note: these values represent part of the in-game CargoTypes enum */ /* Note: these values represent part of the in-game CargoTypes enum */
CT_AUTO_REFIT = ::CARGO_AUTO_REFIT, ///< Automatically choose cargo type when doing auto-refitting. CT_AUTO_REFIT = ::CARGO_AUTO_REFIT, ///< Automatically choose cargo type when doing auto-refitting.
CT_NO_REFIT = ::CARGO_NO_REFIT, ///< Do not refit cargo of a vehicle. CT_NO_REFIT = ::CARGO_NO_REFIT, ///< Do not refit cargo of a vehicle.
@ -75,7 +75,7 @@ public:
* @param cargo_type The cargo to check. * @param cargo_type The cargo to check.
* @return True if and only if the cargo type is valid. * @return True if and only if the cargo type is valid.
*/ */
static bool IsValidCargo(CargoID cargo_type); static bool IsValidCargo(CargoType cargo_type);
/** /**
* Checks whether the given town effect type is valid. * Checks whether the given town effect type is valid.
@ -90,7 +90,7 @@ public:
* @pre IsValidCargo(cargo_type). * @pre IsValidCargo(cargo_type).
* @return The name of the cargo type. * @return The name of the cargo type.
*/ */
static std::optional<std::string> GetName(CargoID cargo_type); static std::optional<std::string> GetName(CargoType cargo_type);
/** /**
* Gets the string representation of the cargo label. * Gets the string representation of the cargo label.
@ -107,7 +107,7 @@ public:
* - In other words: Only use the cargo label, if you know more about the behaviour * - In other words: Only use the cargo label, if you know more about the behaviour
* of a specific cargo from a specific industry set, than the API methods can tell you. * of a specific cargo from a specific industry set, than the API methods can tell you.
*/ */
static std::optional<std::string> GetCargoLabel(CargoID cargo_type); static std::optional<std::string> GetCargoLabel(CargoType cargo_type);
/** /**
* Checks whether the give cargo is a freight or not. * Checks whether the give cargo is a freight or not.
@ -117,7 +117,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo_type). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return True if and only if the cargo is freight. * @return True if and only if the cargo is freight.
*/ */
static bool IsFreight(CargoID cargo_type); static bool IsFreight(CargoType cargo_type);
/** /**
* Check if this cargo is in the requested cargo class. * Check if this cargo is in the requested cargo class.
@ -126,7 +126,7 @@ public:
* @param cargo_class The class to check for. * @param cargo_class The class to check for.
* @return True if and only if the cargo is in the cargo class. * @return True if and only if the cargo is in the cargo class.
*/ */
static bool HasCargoClass(CargoID cargo_type, CargoClass cargo_class); static bool HasCargoClass(CargoType cargo_type, CargoClass cargo_class);
/** /**
* Get the effect this cargo has on a town. * Get the effect this cargo has on a town.
@ -134,7 +134,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo_type). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The effect this cargo has on a town, or TE_NONE if it has no effect. * @return The effect this cargo has on a town, or TE_NONE if it has no effect.
*/ */
static TownEffect GetTownEffect(CargoID cargo_type); static TownEffect GetTownEffect(CargoType cargo_type);
/** /**
* Get the income for transporting a piece of cargo over the * Get the income for transporting a piece of cargo over the
@ -147,14 +147,14 @@ public:
* The max value of this variable is 637. Any value higher returns the same as 637 would. * The max value of this variable is 637. Any value higher returns the same as 637 would.
* @return The amount of money that would be earned by this trip. * @return The amount of money that would be earned by this trip.
*/ */
static Money GetCargoIncome(CargoID cargo_type, SQInteger distance, SQInteger days_in_transit); static Money GetCargoIncome(CargoType cargo_type, SQInteger distance, SQInteger days_in_transit);
/** /**
* Get the cargo distribution type for a cargo. * Get the cargo distribution type for a cargo.
* @param cargo_type The cargo to check on. * @param cargo_type The cargo to check on.
* @return The cargo distribution type for the given cargo. * @return The cargo distribution type for the given cargo.
*/ */
static DistributionType GetDistributionType(CargoID cargo_type); static DistributionType GetDistributionType(CargoType cargo_type);
/** /**
* Get the weight in tonnes for the given amount of * Get the weight in tonnes for the given amount of
@ -165,7 +165,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo_type). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The weight in tonnes for that quantity of cargo. * @return The weight in tonnes for that quantity of cargo.
*/ */
static SQInteger GetWeight(CargoID cargo_type, SQInteger amount); static SQInteger GetWeight(CargoType cargo_type, SQInteger amount);
}; };
#endif /* SCRIPT_CARGO_HPP */ #endif /* SCRIPT_CARGO_HPP */

6
src/script/api/script_cargolist.cpp
View File

@ -30,7 +30,7 @@ ScriptCargoList_IndustryAccepting::ScriptCargoList_IndustryAccepting(IndustryID
const Industry *ind = ::Industry::Get(industry_id); const Industry *ind = ::Industry::Get(industry_id);
for (const auto &a : ind->accepted) { for (const auto &a : ind->accepted) {
if (::IsValidCargoID(a.cargo)) { if (::IsValidCargoType(a.cargo)) {
this->AddItem(a.cargo); this->AddItem(a.cargo);
} }
} }
@ -42,7 +42,7 @@ ScriptCargoList_IndustryProducing::ScriptCargoList_IndustryProducing(IndustryID
const Industry *ind = ::Industry::Get(industry_id); const Industry *ind = ::Industry::Get(industry_id);
for (const auto &p : ind->produced) { for (const auto &p : ind->produced) {
if (::IsValidCargoID(p.cargo)) { if (::IsValidCargoType(p.cargo)) {
this->AddItem(p.cargo); this->AddItem(p.cargo);
} }
} }
@ -53,7 +53,7 @@ ScriptCargoList_StationAccepting::ScriptCargoList_StationAccepting(StationID sta
if (!ScriptStation::IsValidStation(station_id)) return; if (!ScriptStation::IsValidStation(station_id)) return;
const Station *st = ::Station::Get(station_id); const Station *st = ::Station::Get(station_id);
for (CargoID i = 0; i < NUM_CARGO; i++) { for (CargoType i = 0; i < NUM_CARGO; i++) {
if (HasBit(st->goods[i].status, GoodsEntry::GES_ACCEPTANCE)) this->AddItem(i); if (HasBit(st->goods[i].status, GoodsEntry::GES_ACCEPTANCE)) this->AddItem(i);
} }
} }

8
src/script/api/script_cargomonitor.cpp
View File

@ -15,7 +15,7 @@
#include "../../safeguards.h" #include "../../safeguards.h"
/* static */ SQInteger ScriptCargoMonitor::GetTownDeliveryAmount(ScriptCompany::CompanyID company, CargoID cargo, TownID town_id, bool keep_monitoring) /* static */ SQInteger ScriptCargoMonitor::GetTownDeliveryAmount(ScriptCompany::CompanyID company, CargoType cargo, TownID town_id, bool keep_monitoring)
{ {
CompanyID cid = static_cast<CompanyID>(company); CompanyID cid = static_cast<CompanyID>(company);
if (cid >= MAX_COMPANIES) return -1; if (cid >= MAX_COMPANIES) return -1;
@ -26,7 +26,7 @@
return GetDeliveryAmount(monitor, keep_monitoring); return GetDeliveryAmount(monitor, keep_monitoring);
} }
/* static */ SQInteger ScriptCargoMonitor::GetIndustryDeliveryAmount(ScriptCompany::CompanyID company, CargoID cargo, IndustryID industry_id, bool keep_monitoring) /* static */ SQInteger ScriptCargoMonitor::GetIndustryDeliveryAmount(ScriptCompany::CompanyID company, CargoType cargo, IndustryID industry_id, bool keep_monitoring)
{ {
CompanyID cid = static_cast<CompanyID>(company); CompanyID cid = static_cast<CompanyID>(company);
if (cid >= MAX_COMPANIES) return -1; if (cid >= MAX_COMPANIES) return -1;
@ -37,7 +37,7 @@
return GetDeliveryAmount(monitor, keep_monitoring); return GetDeliveryAmount(monitor, keep_monitoring);
} }
/* static */ SQInteger ScriptCargoMonitor::GetTownPickupAmount(ScriptCompany::CompanyID company, CargoID cargo, TownID town_id, bool keep_monitoring) /* static */ SQInteger ScriptCargoMonitor::GetTownPickupAmount(ScriptCompany::CompanyID company, CargoType cargo, TownID town_id, bool keep_monitoring)
{ {
CompanyID cid = static_cast<CompanyID>(company); CompanyID cid = static_cast<CompanyID>(company);
if (cid >= MAX_COMPANIES) return -1; if (cid >= MAX_COMPANIES) return -1;
@ -48,7 +48,7 @@
return GetPickupAmount(monitor, keep_monitoring); return GetPickupAmount(monitor, keep_monitoring);
} }
/* static */ SQInteger ScriptCargoMonitor::GetIndustryPickupAmount(ScriptCompany::CompanyID company, CargoID cargo, IndustryID industry_id, bool keep_monitoring) /* static */ SQInteger ScriptCargoMonitor::GetIndustryPickupAmount(ScriptCompany::CompanyID company, CargoType cargo, IndustryID industry_id, bool keep_monitoring)
{ {
CompanyID cid = static_cast<CompanyID>(company); CompanyID cid = static_cast<CompanyID>(company);
if (cid >= MAX_COMPANIES) return -1; if (cid >= MAX_COMPANIES) return -1;

8
src/script/api/script_cargomonitor.hpp
View File

@ -51,7 +51,7 @@ public:
* @return Amount of delivered cargo of the given cargo type to the given town by the given company since the last call, or * @return Amount of delivered cargo of the given cargo type to the given town by the given company since the last call, or
* \c -1 if a parameter is out-of-bound. * \c -1 if a parameter is out-of-bound.
*/ */
static SQInteger GetTownDeliveryAmount(ScriptCompany::CompanyID company, CargoID cargo, TownID town_id, bool keep_monitoring); static SQInteger GetTownDeliveryAmount(ScriptCompany::CompanyID company, CargoType cargo, TownID town_id, bool keep_monitoring);
/** /**
* Get the amount of cargo delivered to an industry by a company since the last query, and update the monitoring state. * Get the amount of cargo delivered to an industry by a company since the last query, and update the monitoring state.
@ -62,7 +62,7 @@ public:
* @return Amount of delivered cargo of the given cargo type to the given industry by the given company since the last call, or * @return Amount of delivered cargo of the given cargo type to the given industry by the given company since the last call, or
* \c -1 if a parameter is out-of-bound. * \c -1 if a parameter is out-of-bound.
*/ */
static SQInteger GetIndustryDeliveryAmount(ScriptCompany::CompanyID company, CargoID cargo, IndustryID industry_id, bool keep_monitoring); static SQInteger GetIndustryDeliveryAmount(ScriptCompany::CompanyID company, CargoType cargo, IndustryID industry_id, bool keep_monitoring);
/** /**
* Get the amount of cargo picked up (and delivered) from a town by a company since the last query, and update the monitoring state. * Get the amount of cargo picked up (and delivered) from a town by a company since the last query, and update the monitoring state.
@ -74,7 +74,7 @@ public:
* \c -1 if a parameter is out-of-bound. * \c -1 if a parameter is out-of-bound.
* @note Amounts of picked-up cargo are added during final delivery of it, to prevent users from getting credit for picking up without delivering it. * @note Amounts of picked-up cargo are added during final delivery of it, to prevent users from getting credit for picking up without delivering it.
*/ */
static SQInteger GetTownPickupAmount(ScriptCompany::CompanyID company, CargoID cargo, TownID town_id, bool keep_monitoring); static SQInteger GetTownPickupAmount(ScriptCompany::CompanyID company, CargoType cargo, TownID town_id, bool keep_monitoring);
/** /**
* Get the amount of cargo picked up (and delivered) from an industry by a company since the last query, and update the monitoring state. * Get the amount of cargo picked up (and delivered) from an industry by a company since the last query, and update the monitoring state.
@ -86,7 +86,7 @@ public:
* \c -1 if a parameter is out-of-bound. * \c -1 if a parameter is out-of-bound.
* @note Amounts of picked-up cargo are added during final delivery of it, to prevent users from getting credit for picking up without delivering it. * @note Amounts of picked-up cargo are added during final delivery of it, to prevent users from getting credit for picking up without delivering it.
*/ */
static SQInteger GetIndustryPickupAmount(ScriptCompany::CompanyID company, CargoID cargo, IndustryID industry_id, bool keep_monitoring); static SQInteger GetIndustryPickupAmount(ScriptCompany::CompanyID company, CargoType cargo, IndustryID industry_id, bool keep_monitoring);
/** Stop monitoring everything. */ /** Stop monitoring everything. */
static void StopAllMonitoring(); static void StopAllMonitoring();

16
src/script/api/script_engine.cpp
View File

@ -50,7 +50,7 @@
return GetString(STR_ENGINE_NAME); return GetString(STR_ENGINE_NAME);
} }
/* static */ CargoID ScriptEngine::GetCargoType(EngineID engine_id) /* static */ CargoType ScriptEngine::GetCargoType(EngineID engine_id)
{ {
if (!IsValidEngine(engine_id)) return INVALID_CARGO; if (!IsValidEngine(engine_id)) return INVALID_CARGO;
@ -59,24 +59,24 @@
auto it = std::max_element(std::cbegin(cap), std::cend(cap)); auto it = std::max_element(std::cbegin(cap), std::cend(cap));
if (*it == 0) return INVALID_CARGO; if (*it == 0) return INVALID_CARGO;
return CargoID(std::distance(std::cbegin(cap), it)); return CargoType(std::distance(std::cbegin(cap), it));
} }
/* static */ bool ScriptEngine::CanRefitCargo(EngineID engine_id, CargoID cargo_id) /* static */ bool ScriptEngine::CanRefitCargo(EngineID engine_id, CargoType cargo_type)
{ {
if (!IsValidEngine(engine_id)) return false; if (!IsValidEngine(engine_id)) return false;
if (!ScriptCargo::IsValidCargo(cargo_id)) return false; if (!ScriptCargo::IsValidCargo(cargo_type)) return false;
return HasBit(::GetUnionOfArticulatedRefitMasks(engine_id, true), cargo_id); return HasBit(::GetUnionOfArticulatedRefitMasks(engine_id, true), cargo_type);
} }
/* static */ bool ScriptEngine::CanPullCargo(EngineID engine_id, CargoID cargo_id) /* static */ bool ScriptEngine::CanPullCargo(EngineID engine_id, CargoType cargo_type)
{ {
if (!IsValidEngine(engine_id)) return false; if (!IsValidEngine(engine_id)) return false;
if (GetVehicleType(engine_id) != ScriptVehicle::VT_RAIL) return false; if (GetVehicleType(engine_id) != ScriptVehicle::VT_RAIL) return false;
if (!ScriptCargo::IsValidCargo(cargo_id)) return false; if (!ScriptCargo::IsValidCargo(cargo_type)) return false;
return (::RailVehInfo(engine_id)->ai_passenger_only != 1) || ScriptCargo::HasCargoClass(cargo_id, ScriptCargo::CC_PASSENGERS); return (::RailVehInfo(engine_id)->ai_passenger_only != 1) || ScriptCargo::HasCargoClass(cargo_type, ScriptCargo::CC_PASSENGERS);
} }

14
src/script/api/script_engine.hpp
View File

@ -53,7 +53,7 @@ public:
* @pre IsValidEngine(engine_id). * @pre IsValidEngine(engine_id).
* @return The cargo-type of the engine. * @return The cargo-type of the engine.
*/ */
static CargoID GetCargoType(EngineID engine_id); static CargoType GetCargoType(EngineID engine_id);
/** /**
* Check if the cargo of an engine can be refitted to your requested. If * Check if the cargo of an engine can be refitted to your requested. If
@ -61,26 +61,26 @@ public:
* In case of articulated vehicles the function decides whether at least one * In case of articulated vehicles the function decides whether at least one
* part can carry the cargo. * part can carry the cargo.
* @param engine_id The engine to check for refitting. * @param engine_id The engine to check for refitting.
* @param cargo_id The cargo to check for refitting. * @param cargo_type The cargo to check for refitting.
* @pre IsValidEngine(engine_id). * @pre IsValidEngine(engine_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return True if the engine can carry this cargo, either via refit, or * @return True if the engine can carry this cargo, either via refit, or
* by default. * by default.
*/ */
static bool CanRefitCargo(EngineID engine_id, CargoID cargo_id); static bool CanRefitCargo(EngineID engine_id, CargoType cargo_type);
/** /**
* Check if the engine can pull a wagon with the given cargo. * Check if the engine can pull a wagon with the given cargo.
* @param engine_id The engine to check. * @param engine_id The engine to check.
* @param cargo_id The cargo to check. * @param cargo_type The cargo to check.
* @pre IsValidEngine(engine_id). * @pre IsValidEngine(engine_id).
* @pre GetVehicleType(engine_id) == ScriptVehicle::VT_RAIL. * @pre GetVehicleType(engine_id) == ScriptVehicle::VT_RAIL.
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return True if the engine can pull wagons carrying this cargo. * @return True if the engine can pull wagons carrying this cargo.
* @note This function is not exhaustive; a true here does not mean * @note This function is not exhaustive; a true here does not mean
* that the vehicle can pull the wagons, a false does mean it can't. * that the vehicle can pull the wagons, a false does mean it can't.
*/ */
static bool CanPullCargo(EngineID engine_id, CargoID cargo_id); static bool CanPullCargo(EngineID engine_id, CargoType cargo_type);
/** /**
* Get the capacity of an engine. In case it can transport multiple cargoes, it * Get the capacity of an engine. In case it can transport multiple cargoes, it

4
src/script/api/script_event_types.cpp
View File

@ -37,7 +37,7 @@ std::optional<std::string> ScriptEventEnginePreview::GetName()
return GetString(STR_ENGINE_NAME); return GetString(STR_ENGINE_NAME);
} }
CargoID ScriptEventEnginePreview::GetCargoType() CargoType ScriptEventEnginePreview::GetCargoType()
{ {
if (!this->IsEngineValid()) return INVALID_CARGO; if (!this->IsEngineValid()) return INVALID_CARGO;
CargoArray cap = ::GetCapacityOfArticulatedParts(this->engine); CargoArray cap = ::GetCapacityOfArticulatedParts(this->engine);
@ -45,7 +45,7 @@ CargoID ScriptEventEnginePreview::GetCargoType()
auto it = std::max_element(std::cbegin(cap), std::cend(cap)); auto it = std::max_element(std::cbegin(cap), std::cend(cap));
if (*it == 0) return INVALID_CARGO; if (*it == 0) return INVALID_CARGO;
return CargoID(std::distance(std::cbegin(cap), it)); return CargoType(std::distance(std::cbegin(cap), it));
} }
int32_t ScriptEventEnginePreview::GetCapacity() int32_t ScriptEventEnginePreview::GetCapacity()

2
src/script/api/script_event_types.hpp
View File

@ -255,7 +255,7 @@ public:
* returns the first/main. * returns the first/main.
* @return The cargo-type of the engine. * @return The cargo-type of the engine.
*/ */
CargoID GetCargoType(); CargoType GetCargoType();
/** /**
* Get the capacity of the offered engine. In case it can transport multiple cargoes, it * Get the capacity of the offered engine. In case it can transport multiple cargoes, it

36
src/script/api/script_industry.cpp
View File

@ -66,67 +66,67 @@
return ScriptObject::Command<CMD_INDUSTRY_SET_TEXT>::Do(industry_id, text != nullptr ? text->GetEncodedText() : std::string{}); return ScriptObject::Command<CMD_INDUSTRY_SET_TEXT>::Do(industry_id, text != nullptr ? text->GetEncodedText() : std::string{});
} }
/* static */ ScriptIndustry::CargoAcceptState ScriptIndustry::IsCargoAccepted(IndustryID industry_id, CargoID cargo_id) /* static */ ScriptIndustry::CargoAcceptState ScriptIndustry::IsCargoAccepted(IndustryID industry_id, CargoType cargo_type)
{ {
if (!IsValidIndustry(industry_id)) return CAS_NOT_ACCEPTED; if (!IsValidIndustry(industry_id)) return CAS_NOT_ACCEPTED;
if (!ScriptCargo::IsValidCargo(cargo_id)) return CAS_NOT_ACCEPTED; if (!ScriptCargo::IsValidCargo(cargo_type)) return CAS_NOT_ACCEPTED;
/* Not const because IndustryTemporarilyRefusesCargo tests a callback which needs a non-const object. */ /* Not const because IndustryTemporarilyRefusesCargo tests a callback which needs a non-const object. */
Industry *i = ::Industry::Get(industry_id); Industry *i = ::Industry::Get(industry_id);
if (!i->IsCargoAccepted(cargo_id)) return CAS_NOT_ACCEPTED; if (!i->IsCargoAccepted(cargo_type)) return CAS_NOT_ACCEPTED;
if (IndustryTemporarilyRefusesCargo(i, cargo_id)) return CAS_TEMP_REFUSED; if (IndustryTemporarilyRefusesCargo(i, cargo_type)) return CAS_TEMP_REFUSED;
return CAS_ACCEPTED; return CAS_ACCEPTED;
} }
/* static */ SQInteger ScriptIndustry::GetStockpiledCargo(IndustryID industry_id, CargoID cargo_id) /* static */ SQInteger ScriptIndustry::GetStockpiledCargo(IndustryID industry_id, CargoType cargo_type)
{ {
if (!IsValidIndustry(industry_id)) return -1; if (!IsValidIndustry(industry_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Industry *i = ::Industry::Get(industry_id); const Industry *i = ::Industry::Get(industry_id);
auto it = i->GetCargoAccepted(cargo_id); auto it = i->GetCargoAccepted(cargo_type);
if (it == std::end(i->accepted)) return -1; if (it == std::end(i->accepted)) return -1;
return it->waiting; return it->waiting;
} }
/* static */ SQInteger ScriptIndustry::GetLastMonthProduction(IndustryID industry_id, CargoID cargo_id) /* static */ SQInteger ScriptIndustry::GetLastMonthProduction(IndustryID industry_id, CargoType cargo_type)
{ {
if (!IsValidIndustry(industry_id)) return -1; if (!IsValidIndustry(industry_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Industry *i = ::Industry::Get(industry_id); const Industry *i = ::Industry::Get(industry_id);
auto it = i->GetCargoProduced(cargo_id); auto it = i->GetCargoProduced(cargo_type);
if (it == std::end(i->produced)) return -1; if (it == std::end(i->produced)) return -1;
return it->history[LAST_MONTH].production; return it->history[LAST_MONTH].production;
} }
/* static */ SQInteger ScriptIndustry::GetLastMonthTransported(IndustryID industry_id, CargoID cargo_id) /* static */ SQInteger ScriptIndustry::GetLastMonthTransported(IndustryID industry_id, CargoType cargo_type)
{ {
if (!IsValidIndustry(industry_id)) return -1; if (!IsValidIndustry(industry_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Industry *i = ::Industry::Get(industry_id); const Industry *i = ::Industry::Get(industry_id);
auto it = i->GetCargoProduced(cargo_id); auto it = i->GetCargoProduced(cargo_type);
if (it == std::end(i->produced)) return -1; if (it == std::end(i->produced)) return -1;
return it->history[LAST_MONTH].transported; return it->history[LAST_MONTH].transported;
} }
/* static */ SQInteger ScriptIndustry::GetLastMonthTransportedPercentage(IndustryID industry_id, CargoID cargo_id) /* static */ SQInteger ScriptIndustry::GetLastMonthTransportedPercentage(IndustryID industry_id, CargoType cargo_type)
{ {
if (!IsValidIndustry(industry_id)) return -1; if (!IsValidIndustry(industry_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Industry *i = ::Industry::Get(industry_id); const Industry *i = ::Industry::Get(industry_id);
auto it = i->GetCargoProduced(cargo_id); auto it = i->GetCargoProduced(cargo_type);
if (it == std::end(i->produced)) return -1; if (it == std::end(i->produced)) return -1;
return ::ToPercent8(it->history[LAST_MONTH].PctTransported()); return ::ToPercent8(it->history[LAST_MONTH].PctTransported());
@ -226,12 +226,12 @@
return i->last_prod_year.base(); return i->last_prod_year.base();
} }
/* static */ ScriptDate::Date ScriptIndustry::GetCargoLastAcceptedDate(IndustryID industry_id, CargoID cargo_type) /* static */ ScriptDate::Date ScriptIndustry::GetCargoLastAcceptedDate(IndustryID industry_id, CargoType cargo_type)
{ {
const Industry *i = Industry::GetIfValid(industry_id); const Industry *i = Industry::GetIfValid(industry_id);
if (i == nullptr) return ScriptDate::DATE_INVALID; if (i == nullptr) return ScriptDate::DATE_INVALID;
if (!::IsValidCargoID(cargo_type)) { if (!::IsValidCargoType(cargo_type)) {
auto it = std::max_element(std::begin(i->accepted), std::end(i->accepted), [](const auto &a, const auto &b) { return a.last_accepted < b.last_accepted; }); auto it = std::max_element(std::begin(i->accepted), std::end(i->accepted), [](const auto &a, const auto &b) { return a.last_accepted < b.last_accepted; });
return (ScriptDate::Date)it->last_accepted.base(); return (ScriptDate::Date)it->last_accepted.base();
} else { } else {

38
src/script/api/script_industry.hpp
View File

@ -23,9 +23,9 @@ class ScriptIndustry : public ScriptObject {
public: public:
/** Ways for an industry to accept a cargo. */ /** Ways for an industry to accept a cargo. */
enum CargoAcceptState { enum CargoAcceptState {
CAS_NOT_ACCEPTED, ///< The CargoID is not accepted by this industry. CAS_NOT_ACCEPTED, ///< The CargoType is not accepted by this industry.
CAS_ACCEPTED, ///< The industry currently accepts this CargoID. CAS_ACCEPTED, ///< The industry currently accepts this CargoType.
CAS_TEMP_REFUSED, ///< The industry temporarily refuses to accept this CargoID but may do so again in the future. CAS_TEMP_REFUSED, ///< The industry temporarily refuses to accept this CargoType but may do so again in the future.
}; };
/** /**
@ -109,55 +109,55 @@ public:
/** /**
* See whether an industry currently accepts a certain cargo. * See whether an industry currently accepts a certain cargo.
* @param industry_id The index of the industry. * @param industry_id The index of the industry.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidIndustry(industry_id). * @pre IsValidIndustry(industry_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return Whether the industry accepts, temporarily refuses or never accepts this cargo. * @return Whether the industry accepts, temporarily refuses or never accepts this cargo.
*/ */
static CargoAcceptState IsCargoAccepted(IndustryID industry_id, CargoID cargo_id); static CargoAcceptState IsCargoAccepted(IndustryID industry_id, CargoType cargo_type);
/** /**
* Get the amount of cargo stockpiled for processing. * Get the amount of cargo stockpiled for processing.
* @param industry_id The index of the industry. * @param industry_id The index of the industry.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidIndustry(industry_id). * @pre IsValidIndustry(industry_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The amount of cargo that is waiting for processing. * @return The amount of cargo that is waiting for processing.
*/ */
static SQInteger GetStockpiledCargo(IndustryID industry_id, CargoID cargo_id); static SQInteger GetStockpiledCargo(IndustryID industry_id, CargoType cargo_type);
/** /**
* Get the total last economy-month's production of the given cargo at an industry. * Get the total last economy-month's production of the given cargo at an industry.
* @param industry_id The index of the industry. * @param industry_id The index of the industry.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidIndustry(industry_id). * @pre IsValidIndustry(industry_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The last economy-month's production of the given cargo for this industry. * @return The last economy-month's production of the given cargo for this industry.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */
static SQInteger GetLastMonthProduction(IndustryID industry_id, CargoID cargo_id); static SQInteger GetLastMonthProduction(IndustryID industry_id, CargoType cargo_type);
/** /**
* Get the total amount of cargo transported from an industry last economy-month. * Get the total amount of cargo transported from an industry last economy-month.
* @param industry_id The index of the industry. * @param industry_id The index of the industry.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidIndustry(industry_id). * @pre IsValidIndustry(industry_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The amount of given cargo transported from this industry last economy-month. * @return The amount of given cargo transported from this industry last economy-month.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */
static SQInteger GetLastMonthTransported(IndustryID industry_id, CargoID cargo_id); static SQInteger GetLastMonthTransported(IndustryID industry_id, CargoType cargo_type);
/** /**
* Get the percentage of cargo transported from an industry last economy-month. * Get the percentage of cargo transported from an industry last economy-month.
* @param industry_id The index of the industry. * @param industry_id The index of the industry.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidIndustry(industry_id). * @pre IsValidIndustry(industry_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The percentage of given cargo transported from this industry last economy-month. * @return The percentage of given cargo transported from this industry last economy-month.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */
static SQInteger GetLastMonthTransportedPercentage(IndustryID industry_id, CargoID cargo_id); static SQInteger GetLastMonthTransportedPercentage(IndustryID industry_id, CargoType cargo_type);
/** /**
* Gets the location of the industry. * Gets the location of the industry.
@ -269,7 +269,7 @@ public:
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
* @api -ai * @api -ai
*/ */
static ScriptDate::Date GetCargoLastAcceptedDate(IndustryID industry_id, CargoID cargo_type); static ScriptDate::Date GetCargoLastAcceptedDate(IndustryID industry_id, CargoType cargo_type);
/** /**
* Get the current control flags for an industry. * Get the current control flags for an industry.

8
src/script/api/script_industrylist.cpp
View File

@ -18,16 +18,16 @@ ScriptIndustryList::ScriptIndustryList(HSQUIRRELVM vm)
ScriptList::FillList<Industry>(vm, this); ScriptList::FillList<Industry>(vm, this);
} }
ScriptIndustryList_CargoAccepting::ScriptIndustryList_CargoAccepting(CargoID cargo_id) ScriptIndustryList_CargoAccepting::ScriptIndustryList_CargoAccepting(CargoType cargo_type)
{ {
ScriptList::FillList<Industry>(this, ScriptList::FillList<Industry>(this,
[cargo_id](const Industry *i) { return i->IsCargoAccepted(cargo_id); } [cargo_type](const Industry *i) { return i->IsCargoAccepted(cargo_type); }
); );
} }
ScriptIndustryList_CargoProducing::ScriptIndustryList_CargoProducing(CargoID cargo_id) ScriptIndustryList_CargoProducing::ScriptIndustryList_CargoProducing(CargoType cargo_type)
{ {
ScriptList::FillList<Industry>(this, ScriptList::FillList<Industry>(this,
[cargo_id](const Industry *i) { return i->IsCargoProduced(cargo_id); } [cargo_type](const Industry *i) { return i->IsCargoProduced(cargo_type); }
); );
} }

8
src/script/api/script_industrylist.hpp
View File

@ -58,9 +58,9 @@ public:
class ScriptIndustryList_CargoAccepting : public ScriptList { class ScriptIndustryList_CargoAccepting : public ScriptList {
public: public:
/** /**
* @param cargo_id The cargo this industry should accept. * @param cargo_type The cargo this industry should accept.
*/ */
ScriptIndustryList_CargoAccepting(CargoID cargo_id); ScriptIndustryList_CargoAccepting(CargoType cargo_type);
}; };
/** /**
@ -72,9 +72,9 @@ public:
class ScriptIndustryList_CargoProducing : public ScriptList { class ScriptIndustryList_CargoProducing : public ScriptList {
public: public:
/** /**
* @param cargo_id The cargo this industry should produce. * @param cargo_type The cargo this industry should produce.
*/ */
ScriptIndustryList_CargoProducing(CargoID cargo_id); ScriptIndustryList_CargoProducing(CargoType cargo_type);
}; };
#endif /* SCRIPT_INDUSTRYLIST_HPP */ #endif /* SCRIPT_INDUSTRYLIST_HPP */

8
src/script/api/script_industrytype.cpp
View File

@ -71,8 +71,8 @@
const IndustrySpec *ins = ::GetIndustrySpec(industry_type); const IndustrySpec *ins = ::GetIndustrySpec(industry_type);
ScriptList *list = new ScriptList(); ScriptList *list = new ScriptList();
for (const CargoID &c : ins->produced_cargo) { for (const CargoType &c : ins->produced_cargo) {
if (::IsValidCargoID(c)) list->AddItem(c); if (::IsValidCargoType(c)) list->AddItem(c);
} }
return list; return list;
@ -85,8 +85,8 @@
const IndustrySpec *ins = ::GetIndustrySpec(industry_type); const IndustrySpec *ins = ::GetIndustrySpec(industry_type);
ScriptList *list = new ScriptList(); ScriptList *list = new ScriptList();
for (const CargoID &c : ins->accepts_cargo) { for (const CargoType &c : ins->accepts_cargo) {
if (::IsValidCargoID(c)) list->AddItem(c); if (::IsValidCargoType(c)) list->AddItem(c);
} }
return list; return list;

12
src/script/api/script_industrytype.hpp
View File

@ -42,22 +42,22 @@ public:
static std::optional<std::string> GetName(IndustryType industry_type); static std::optional<std::string> GetName(IndustryType industry_type);
/** /**
* Get a list of CargoID possible produced by this industry-type. * Get a list of CargoType possible produced by this industry-type.
* @warning This function only returns the default cargoes of the industry type. * @warning This function only returns the default cargoes of the industry type.
* Industries can specify new cargotypes on construction. * Industries can specify new cargotypes on construction.
* @param industry_type The type to get the CargoIDs for. * @param industry_type The type to get the CargoTypes for.
* @pre IsValidIndustryType(industry_type). * @pre IsValidIndustryType(industry_type).
* @return The CargoIDs of all cargotypes this industry could produce. * @return The CargoTypes of all cargotypes this industry could produce.
*/ */
static ScriptList *GetProducedCargo(IndustryType industry_type); static ScriptList *GetProducedCargo(IndustryType industry_type);
/** /**
* Get a list of CargoID accepted by this industry-type. * Get a list of CargoType accepted by this industry-type.
* @warning This function only returns the default cargoes of the industry type. * @warning This function only returns the default cargoes of the industry type.
* Industries can specify new cargotypes on construction. * Industries can specify new cargotypes on construction.
* @param industry_type The type to get the CargoIDs for. * @param industry_type The type to get the CargoTypes for.
* @pre IsValidIndustryType(industry_type). * @pre IsValidIndustryType(industry_type).
* @return The CargoIDs of all cargotypes this industry accepts. * @return The CargoTypes of all cargotypes this industry accepts.
*/ */
static ScriptList *GetAcceptedCargo(IndustryType industry_type); static ScriptList *GetAcceptedCargo(IndustryType industry_type);

4
src/script/api/script_order.cpp
View File

@ -370,7 +370,7 @@ static int ScriptOrderPositionToRealOrderPosition(VehicleID vehicle_id, ScriptOr
return (ScriptOrder::StopLocation)order->GetStopLocation(); return (ScriptOrder::StopLocation)order->GetStopLocation();
} }
/* static */ CargoID ScriptOrder::GetOrderRefit(VehicleID vehicle_id, OrderPosition order_position) /* static */ CargoType ScriptOrder::GetOrderRefit(VehicleID vehicle_id, OrderPosition order_position)
{ {
if (!IsValidVehicleOrder(vehicle_id, order_position)) return CARGO_NO_REFIT; if (!IsValidVehicleOrder(vehicle_id, order_position)) return CARGO_NO_REFIT;
if (order_position != ORDER_CURRENT && !IsGotoStationOrder(vehicle_id, order_position) && !IsGotoDepotOrder(vehicle_id, order_position)) return CARGO_NO_REFIT; if (order_position != ORDER_CURRENT && !IsGotoStationOrder(vehicle_id, order_position) && !IsGotoDepotOrder(vehicle_id, order_position)) return CARGO_NO_REFIT;
@ -437,7 +437,7 @@ static int ScriptOrderPositionToRealOrderPosition(VehicleID vehicle_id, ScriptOr
return ScriptObject::Command<CMD_MODIFY_ORDER>::Do(0, vehicle_id, order_pos, MOF_STOP_LOCATION, stop_location); return ScriptObject::Command<CMD_MODIFY_ORDER>::Do(0, vehicle_id, order_pos, MOF_STOP_LOCATION, stop_location);
} }
/* static */ bool ScriptOrder::SetOrderRefit(VehicleID vehicle_id, OrderPosition order_position, CargoID refit_cargo) /* static */ bool ScriptOrder::SetOrderRefit(VehicleID vehicle_id, OrderPosition order_position, CargoType refit_cargo)
{ {
EnforceCompanyModeValid(false); EnforceCompanyModeValid(false);
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position)); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position));

4
src/script/api/script_order.hpp
View File

@ -348,7 +348,7 @@ public:
* in the orderlist, but they can be the current order of a vehicle. * in the orderlist, but they can be the current order of a vehicle.
* @return The refit cargo of the order or CT_NO_REFIT if no refit is set. * @return The refit cargo of the order or CT_NO_REFIT if no refit is set.
*/ */
static CargoID GetOrderRefit(VehicleID vehicle_id, OrderPosition order_position); static CargoType GetOrderRefit(VehicleID vehicle_id, OrderPosition order_position);
/** /**
* Sets the OrderPosition to jump to if the check succeeds of the given order for the given vehicle. * Sets the OrderPosition to jump to if the check succeeds of the given order for the given vehicle.
@ -427,7 +427,7 @@ public:
* @game @pre ScriptCompanyMode::IsValid(). * @game @pre ScriptCompanyMode::IsValid().
* @return Whether the order has been/can be changed. * @return Whether the order has been/can be changed.
*/ */
static bool SetOrderRefit(VehicleID vehicle_id, OrderPosition order_position, CargoID refit_cargo); static bool SetOrderRefit(VehicleID vehicle_id, OrderPosition order_position, CargoType refit_cargo);
/** /**
* Appends an order to the end of the vehicle's order list. * Appends an order to the end of the vehicle's order list.

6
src/script/api/script_rail.cpp
View File

@ -162,7 +162,7 @@
return ScriptObject::Command<CMD_BUILD_RAIL_STATION>::Do(tile, (::RailType)GetCurrentRailType(), direction == RAILTRACK_NW_SE ? AXIS_Y : AXIS_X, num_platforms, platform_length, STAT_CLASS_DFLT, 0, ScriptStation::IsValidStation(station_id) ? station_id : INVALID_STATION, adjacent); return ScriptObject::Command<CMD_BUILD_RAIL_STATION>::Do(tile, (::RailType)GetCurrentRailType(), direction == RAILTRACK_NW_SE ? AXIS_Y : AXIS_X, num_platforms, platform_length, STAT_CLASS_DFLT, 0, ScriptStation::IsValidStation(station_id) ? station_id : INVALID_STATION, adjacent);
} }
/* static */ bool ScriptRail::BuildNewGRFRailStation(TileIndex tile, RailTrack direction, SQInteger num_platforms, SQInteger platform_length, StationID station_id, CargoID cargo_id, IndustryType source_industry, IndustryType goal_industry, SQInteger distance, bool source_station) /* static */ bool ScriptRail::BuildNewGRFRailStation(TileIndex tile, RailTrack direction, SQInteger num_platforms, SQInteger platform_length, StationID station_id, CargoType cargo_type, IndustryType source_industry, IndustryType goal_industry, SQInteger distance, bool source_station)
{ {
EnforceCompanyModeValid(false); EnforceCompanyModeValid(false);
EnforcePrecondition(false, ::IsValidTile(tile)); EnforcePrecondition(false, ::IsValidTile(tile));
@ -171,14 +171,14 @@
EnforcePrecondition(false, platform_length > 0 && platform_length <= 0xFF); EnforcePrecondition(false, platform_length > 0 && platform_length <= 0xFF);
EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType())); EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType()));
EnforcePrecondition(false, station_id == ScriptStation::STATION_NEW || station_id == ScriptStation::STATION_JOIN_ADJACENT || ScriptStation::IsValidStation(station_id)); EnforcePrecondition(false, station_id == ScriptStation::STATION_NEW || station_id == ScriptStation::STATION_JOIN_ADJACENT || ScriptStation::IsValidStation(station_id));
EnforcePrecondition(false, ScriptCargo::IsValidCargo(cargo_id)); EnforcePrecondition(false, ScriptCargo::IsValidCargo(cargo_type));
EnforcePrecondition(false, source_industry == ScriptIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == ScriptIndustryType::INDUSTRYTYPE_TOWN || ScriptIndustryType::IsValidIndustryType(source_industry)); EnforcePrecondition(false, source_industry == ScriptIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == ScriptIndustryType::INDUSTRYTYPE_TOWN || ScriptIndustryType::IsValidIndustryType(source_industry));
EnforcePrecondition(false, goal_industry == ScriptIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == ScriptIndustryType::INDUSTRYTYPE_TOWN || ScriptIndustryType::IsValidIndustryType(goal_industry)); EnforcePrecondition(false, goal_industry == ScriptIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == ScriptIndustryType::INDUSTRYTYPE_TOWN || ScriptIndustryType::IsValidIndustryType(goal_industry));
const GRFFile *file; const GRFFile *file;
uint16_t res = GetAiPurchaseCallbackResult( uint16_t res = GetAiPurchaseCallbackResult(
GSF_STATIONS, GSF_STATIONS,
cargo_id, cargo_type,
0, 0,
source_industry, source_industry,
goal_industry, goal_industry,

4
src/script/api/script_rail.hpp
View File

@ -276,7 +276,7 @@ public:
* @param num_platforms The number of platforms to build. * @param num_platforms The number of platforms to build.
* @param platform_length The length of each platform. * @param platform_length The length of each platform.
* @param station_id The station to join, ScriptStation::STATION_NEW or ScriptStation::STATION_JOIN_ADJACENT. * @param station_id The station to join, ScriptStation::STATION_NEW or ScriptStation::STATION_JOIN_ADJACENT.
* @param cargo_id The CargoID of the cargo that will be transported from / to this station. * @param cargo_type The CargoType of the cargo that will be transported from / to this station.
* @param source_industry The IndustryType of the industry you'll transport goods from, ScriptIndustryType::INDUSTRYTYPE_UNKNOWN or ScriptIndustryType::INDUSTRYTYPE_TOWN. * @param source_industry The IndustryType of the industry you'll transport goods from, ScriptIndustryType::INDUSTRYTYPE_UNKNOWN or ScriptIndustryType::INDUSTRYTYPE_TOWN.
* @param goal_industry The IndustryType of the industry you'll transport goods to, ScriptIndustryType::INDUSTRYTYPE_UNKNOWN or ScriptIndustryType::INDUSTRYTYPE_TOWN. * @param goal_industry The IndustryType of the industry you'll transport goods to, ScriptIndustryType::INDUSTRYTYPE_UNKNOWN or ScriptIndustryType::INDUSTRYTYPE_TOWN.
* @param distance The manhattan distance you'll transport the cargo over. * @param distance The manhattan distance you'll transport the cargo over.
@ -299,7 +299,7 @@ public:
* @exception ScriptStation::ERR_STATION_TOO_MANY_STATIONS_IN_TOWN * @exception ScriptStation::ERR_STATION_TOO_MANY_STATIONS_IN_TOWN
* @return Whether the station has been/can be build or not. * @return Whether the station has been/can be build or not.
*/ */
static bool BuildNewGRFRailStation(TileIndex tile, RailTrack direction, SQInteger num_platforms, SQInteger platform_length, StationID station_id, CargoID cargo_id, IndustryType source_industry, IndustryType goal_industry, SQInteger distance, bool source_station); static bool BuildNewGRFRailStation(TileIndex tile, RailTrack direction, SQInteger num_platforms, SQInteger platform_length, StationID station_id, CargoType cargo_type, IndustryType source_industry, IndustryType goal_industry, SQInteger distance, bool source_station);
/** /**
* Build a rail waypoint. * Build a rail waypoint.

2
src/script/api/script_road.cpp
View File

@ -20,7 +20,7 @@
#include "../../safeguards.h" #include "../../safeguards.h"
/* static */ ScriptRoad::RoadVehicleType ScriptRoad::GetRoadVehicleTypeForCargo(CargoID cargo_type) /* static */ ScriptRoad::RoadVehicleType ScriptRoad::GetRoadVehicleTypeForCargo(CargoType cargo_type)
{ {
return ScriptCargo::HasCargoClass(cargo_type, ScriptCargo::CC_PASSENGERS) ? ROADVEHTYPE_BUS : ROADVEHTYPE_TRUCK; return ScriptCargo::HasCargoClass(cargo_type, ScriptCargo::CC_PASSENGERS) ? ROADVEHTYPE_BUS : ROADVEHTYPE_TRUCK;
} }

2
src/script/api/script_road.hpp
View File

@ -100,7 +100,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo_type). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The road vehicle type needed to transport the cargo. * @return The road vehicle type needed to transport the cargo.
*/ */
static RoadVehicleType GetRoadVehicleTypeForCargo(CargoID cargo_type); static RoadVehicleType GetRoadVehicleTypeForCargo(CargoType cargo_type);
/** /**
* Checks whether the given tile is actually a tile with road that can be * Checks whether the given tile is actually a tile with road that can be

60
src/script/api/script_station.cpp
View File

@ -41,25 +41,25 @@
template <bool Tfrom, bool Tvia> template <bool Tfrom, bool Tvia>
/* static */ bool ScriptStation::IsCargoRequestValid(StationID station_id, /* static */ bool ScriptStation::IsCargoRequestValid(StationID station_id,
StationID from_station_id, StationID via_station_id, CargoID cargo_id) StationID from_station_id, StationID via_station_id, CargoType cargo_type)
{ {
if (!IsValidStation(station_id)) return false; if (!IsValidStation(station_id)) return false;
if (Tfrom && !IsValidStation(from_station_id) && from_station_id != STATION_INVALID) return false; if (Tfrom && !IsValidStation(from_station_id) && from_station_id != STATION_INVALID) return false;
if (Tvia && !IsValidStation(via_station_id) && via_station_id != STATION_INVALID) return false; if (Tvia && !IsValidStation(via_station_id) && via_station_id != STATION_INVALID) return false;
if (!ScriptCargo::IsValidCargo(cargo_id)) return false; if (!ScriptCargo::IsValidCargo(cargo_type)) return false;
return true; return true;
} }
template <bool Tfrom, bool Tvia> template <bool Tfrom, bool Tvia>
/* static */ SQInteger ScriptStation::CountCargoWaiting(StationID station_id, /* static */ SQInteger ScriptStation::CountCargoWaiting(StationID station_id,
StationID from_station_id, StationID via_station_id, CargoID cargo_id) StationID from_station_id, StationID via_station_id, CargoType cargo_type)
{ {
if (!ScriptStation::IsCargoRequestValid<Tfrom, Tvia>(station_id, from_station_id, if (!ScriptStation::IsCargoRequestValid<Tfrom, Tvia>(station_id, from_station_id,
via_station_id, cargo_id)) { via_station_id, cargo_type)) {
return -1; return -1;
} }
const ::GoodsEntry &goods = ::Station::Get(station_id)->goods[cargo_id]; const ::GoodsEntry &goods = ::Station::Get(station_id)->goods[cargo_type];
if (!goods.HasData()) return 0; if (!goods.HasData()) return 0;
const StationCargoList &cargo_list = goods.GetData().cargo; const StationCargoList &cargo_list = goods.GetData().cargo;
@ -78,39 +78,39 @@ template <bool Tfrom, bool Tvia>
return cargo_count; return cargo_count;
} }
/* static */ SQInteger ScriptStation::GetCargoWaiting(StationID station_id, CargoID cargo_id) /* static */ SQInteger ScriptStation::GetCargoWaiting(StationID station_id, CargoType cargo_type)
{ {
return CountCargoWaiting<false, false>(station_id, STATION_INVALID, STATION_INVALID, cargo_id); return CountCargoWaiting<false, false>(station_id, STATION_INVALID, STATION_INVALID, cargo_type);
} }
/* static */ SQInteger ScriptStation::GetCargoWaitingFrom(StationID station_id, /* static */ SQInteger ScriptStation::GetCargoWaitingFrom(StationID station_id,
StationID from_station_id, CargoID cargo_id) StationID from_station_id, CargoType cargo_type)
{ {
return CountCargoWaiting<true, false>(station_id, from_station_id, STATION_INVALID, cargo_id); return CountCargoWaiting<true, false>(station_id, from_station_id, STATION_INVALID, cargo_type);
} }
/* static */ SQInteger ScriptStation::GetCargoWaitingVia(StationID station_id, /* static */ SQInteger ScriptStation::GetCargoWaitingVia(StationID station_id,
StationID via_station_id, CargoID cargo_id) StationID via_station_id, CargoType cargo_type)
{ {
return CountCargoWaiting<false, true>(station_id, STATION_INVALID, via_station_id, cargo_id); return CountCargoWaiting<false, true>(station_id, STATION_INVALID, via_station_id, cargo_type);
} }
/* static */ SQInteger ScriptStation::GetCargoWaitingFromVia(StationID station_id, /* static */ SQInteger ScriptStation::GetCargoWaitingFromVia(StationID station_id,
StationID from_station_id, StationID via_station_id, CargoID cargo_id) StationID from_station_id, StationID via_station_id, CargoType cargo_type)
{ {
return CountCargoWaiting<true, true>(station_id, from_station_id, via_station_id, cargo_id); return CountCargoWaiting<true, true>(station_id, from_station_id, via_station_id, cargo_type);
} }
template <bool Tfrom, bool Tvia> template <bool Tfrom, bool Tvia>
/* static */ SQInteger ScriptStation::CountCargoPlanned(StationID station_id, /* static */ SQInteger ScriptStation::CountCargoPlanned(StationID station_id,
StationID from_station_id, StationID via_station_id, CargoID cargo_id) StationID from_station_id, StationID via_station_id, CargoType cargo_type)
{ {
if (!ScriptStation::IsCargoRequestValid<Tfrom, Tvia>(station_id, from_station_id, if (!ScriptStation::IsCargoRequestValid<Tfrom, Tvia>(station_id, from_station_id,
via_station_id, cargo_id)) { via_station_id, cargo_type)) {
return -1; return -1;
} }
const ::GoodsEntry &goods = ::Station::Get(station_id)->goods[cargo_id]; const ::GoodsEntry &goods = ::Station::Get(station_id)->goods[cargo_type];
if (!goods.HasData()) return 0; if (!goods.HasData()) return 0;
const FlowStatMap &flows = goods.GetData().flows; const FlowStatMap &flows = goods.GetData().flows;
@ -122,42 +122,42 @@ template <bool Tfrom, bool Tvia>
} }
} }
/* static */ SQInteger ScriptStation::GetCargoPlanned(StationID station_id, CargoID cargo_id) /* static */ SQInteger ScriptStation::GetCargoPlanned(StationID station_id, CargoType cargo_type)
{ {
return CountCargoPlanned<false, false>(station_id, STATION_INVALID, STATION_INVALID, cargo_id); return CountCargoPlanned<false, false>(station_id, STATION_INVALID, STATION_INVALID, cargo_type);
} }
/* static */ SQInteger ScriptStation::GetCargoPlannedFrom(StationID station_id, /* static */ SQInteger ScriptStation::GetCargoPlannedFrom(StationID station_id,
StationID from_station_id, CargoID cargo_id) StationID from_station_id, CargoType cargo_type)
{ {
return CountCargoPlanned<true, false>(station_id, from_station_id, STATION_INVALID, cargo_id); return CountCargoPlanned<true, false>(station_id, from_station_id, STATION_INVALID, cargo_type);
} }
/* static */ SQInteger ScriptStation::GetCargoPlannedVia(StationID station_id, /* static */ SQInteger ScriptStation::GetCargoPlannedVia(StationID station_id,
StationID via_station_id, CargoID cargo_id) StationID via_station_id, CargoType cargo_type)
{ {
return CountCargoPlanned<false, true>(station_id, STATION_INVALID, via_station_id, cargo_id); return CountCargoPlanned<false, true>(station_id, STATION_INVALID, via_station_id, cargo_type);
} }
/* static */ SQInteger ScriptStation::GetCargoPlannedFromVia(StationID station_id, /* static */ SQInteger ScriptStation::GetCargoPlannedFromVia(StationID station_id,
StationID from_station_id, StationID via_station_id, CargoID cargo_id) StationID from_station_id, StationID via_station_id, CargoType cargo_type)
{ {
return CountCargoPlanned<true, true>(station_id, from_station_id, via_station_id, cargo_id); return CountCargoPlanned<true, true>(station_id, from_station_id, via_station_id, cargo_type);
} }
/* static */ bool ScriptStation::HasCargoRating(StationID station_id, CargoID cargo_id) /* static */ bool ScriptStation::HasCargoRating(StationID station_id, CargoType cargo_type)
{ {
if (!IsValidStation(station_id)) return false; if (!IsValidStation(station_id)) return false;
if (!ScriptCargo::IsValidCargo(cargo_id)) return false; if (!ScriptCargo::IsValidCargo(cargo_type)) return false;
return ::Station::Get(station_id)->goods[cargo_id].HasRating(); return ::Station::Get(station_id)->goods[cargo_type].HasRating();
} }
/* static */ SQInteger ScriptStation::GetCargoRating(StationID station_id, CargoID cargo_id) /* static */ SQInteger ScriptStation::GetCargoRating(StationID station_id, CargoType cargo_type)
{ {
if (!ScriptStation::HasCargoRating(station_id, cargo_id)) return -1; if (!ScriptStation::HasCargoRating(station_id, cargo_type)) return -1;
return ::ToPercent8(::Station::Get(station_id)->goods[cargo_id].rating); return ::ToPercent8(::Station::Get(station_id)->goods[cargo_type].rating);
} }
/* static */ SQInteger ScriptStation::GetCoverageRadius(ScriptStation::StationType station_type) /* static */ SQInteger ScriptStation::GetCoverageRadius(ScriptStation::StationType station_type)

72
src/script/api/script_station.hpp
View File

@ -79,88 +79,88 @@ public:
/** /**
* See how much cargo there is waiting on a station. * See how much cargo there is waiting on a station.
* @param station_id The station to get the cargo-waiting of. * @param station_id The station to get the cargo-waiting of.
* @param cargo_id The cargo to get the cargo-waiting of. * @param cargo_type The cargo to get the cargo-waiting of.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of units waiting at the station. * @return The amount of units waiting at the station.
*/ */
static SQInteger GetCargoWaiting(StationID station_id, CargoID cargo_id); static SQInteger GetCargoWaiting(StationID station_id, CargoType cargo_type);
/** /**
* See how much cargo with a specific source station there is waiting on a station. * See how much cargo with a specific source station there is waiting on a station.
* @param station_id The station to get the cargo-waiting of. * @param station_id The station to get the cargo-waiting of.
* @param from_station_id The source station of the cargo. Pass STATION_INVALID to get cargo of which the source has been deleted. * @param from_station_id The source station of the cargo. Pass STATION_INVALID to get cargo of which the source has been deleted.
* @param cargo_id The cargo to get the cargo-waiting of. * @param cargo_type The cargo to get the cargo-waiting of.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID. * @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID.
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of units waiting at the station originating from from_station_id. * @return The amount of units waiting at the station originating from from_station_id.
* @note source station means, the station where cargo was first loaded. * @note source station means, the station where cargo was first loaded.
*/ */
static SQInteger GetCargoWaitingFrom(StationID station_id, StationID from_station_id, CargoID cargo_id); static SQInteger GetCargoWaitingFrom(StationID station_id, StationID from_station_id, CargoType cargo_type);
/** /**
* See how much cargo with a specific via-station there is waiting on a station. * See how much cargo with a specific via-station there is waiting on a station.
* @param station_id The station to get the cargo-waiting of. * @param station_id The station to get the cargo-waiting of.
* @param via_station_id The next station the cargo is going to. Pass STATION_INVALID to get waiting cargo for "via any station". * @param via_station_id The next station the cargo is going to. Pass STATION_INVALID to get waiting cargo for "via any station".
* @param cargo_id The cargo to get the cargo-waiting of. * @param cargo_type The cargo to get the cargo-waiting of.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID. * @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID.
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of units waiting at the station with via_station_id as next hop. * @return The amount of units waiting at the station with via_station_id as next hop.
* @note if ScriptCargo.GetCargoDistributionType(cargo_id) == ScriptCargo.DT_MANUAL, then all waiting cargo will have STATION_INVALID as next hop. * @note if ScriptCargo.GetCargoDistributionType(cargo_type) == ScriptCargo.DT_MANUAL, then all waiting cargo will have STATION_INVALID as next hop.
*/ */
static SQInteger GetCargoWaitingVia(StationID station_id, StationID via_station_id, CargoID cargo_id); static SQInteger GetCargoWaitingVia(StationID station_id, StationID via_station_id, CargoType cargo_type);
/** /**
* See how much cargo with a specific via-station and source station there is waiting on a station. * See how much cargo with a specific via-station and source station there is waiting on a station.
* @param station_id The station to get the cargo-waiting of. * @param station_id The station to get the cargo-waiting of.
* @param from_station_id The source station of the cargo. Pass STATION_INVALID to get cargo of which the source has been deleted. * @param from_station_id The source station of the cargo. Pass STATION_INVALID to get cargo of which the source has been deleted.
* @param via_station_id The next station the cargo is going to. Pass STATION_INVALID to get waiting cargo for "via any station". * @param via_station_id The next station the cargo is going to. Pass STATION_INVALID to get waiting cargo for "via any station".
* @param cargo_id The cargo to get the cargo-waiting of. * @param cargo_type The cargo to get the cargo-waiting of.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID. * @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID.
* @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID. * @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID.
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of units waiting at the station with from_station_id as source and via_station_id as next hop. * @return The amount of units waiting at the station with from_station_id as source and via_station_id as next hop.
* @note if ScriptCargo.GetCargoDistributionType(cargo_id) == ScriptCargo.DT_MANUAL, then all waiting cargo will have STATION_INVALID as next hop. * @note if ScriptCargo.GetCargoDistributionType(cargo_type) == ScriptCargo.DT_MANUAL, then all waiting cargo will have STATION_INVALID as next hop.
*/ */
static SQInteger GetCargoWaitingFromVia(StationID station_id, StationID from_station_id, StationID via_station_id, CargoID cargo_id); static SQInteger GetCargoWaitingFromVia(StationID station_id, StationID from_station_id, StationID via_station_id, CargoType cargo_type);
/** /**
* See how much cargo was planned to pass (including production and consumption) this station per month. * See how much cargo was planned to pass (including production and consumption) this station per month.
* @param station_id The station to get the planned flow for. * @param station_id The station to get the planned flow for.
* @param cargo_id The cargo type to get the planned flow for. * @param cargo_type The cargo type to get the planned flow for.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of cargo units planned to pass the station per month. * @return The amount of cargo units planned to pass the station per month.
*/ */
static SQInteger GetCargoPlanned(StationID station_id, CargoID cargo_id); static SQInteger GetCargoPlanned(StationID station_id, CargoType cargo_type);
/** /**
* See how much cargo from the specified origin was planned to pass (including production and consumption) this station per month. * See how much cargo from the specified origin was planned to pass (including production and consumption) this station per month.
* @param station_id The station to get the planned flow for. * @param station_id The station to get the planned flow for.
* @param from_station_id The station the cargo originates at. * @param from_station_id The station the cargo originates at.
* @param cargo_id The cargo type to get the planned flow for. * @param cargo_type The cargo type to get the planned flow for.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID. * @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID.
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of cargo units from the specified origin planned to pass the station per month. * @return The amount of cargo units from the specified origin planned to pass the station per month.
*/ */
static SQInteger GetCargoPlannedFrom(StationID station_id, StationID from_station_id, CargoID cargo_id); static SQInteger GetCargoPlannedFrom(StationID station_id, StationID from_station_id, CargoType cargo_type);
/** /**
* See how much cargo was planned to pass (including production and consumption) this station per month, heading for the specified next hop. * See how much cargo was planned to pass (including production and consumption) this station per month, heading for the specified next hop.
* @param station_id The station to get the planned flow for. * @param station_id The station to get the planned flow for.
* @param via_station_id The next station the cargo will go on to. * @param via_station_id The next station the cargo will go on to.
* @param cargo_id The cargo type to get the planned flow for. * @param cargo_type The cargo type to get the planned flow for.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID. * @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID.
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of cargo units planned to pass the station per month, going via the specified next hop. * @return The amount of cargo units planned to pass the station per month, going via the specified next hop.
* @note Cargo planned to go "via" the same station that's being queried is actually planned to be consumed there. * @note Cargo planned to go "via" the same station that's being queried is actually planned to be consumed there.
*/ */
static SQInteger GetCargoPlannedVia(StationID station_id, StationID via_station_id, CargoID cargo_id); static SQInteger GetCargoPlannedVia(StationID station_id, StationID via_station_id, CargoType cargo_type);
/** /**
* See how much cargo from the specified origin was planned to pass this station per month, * See how much cargo from the specified origin was planned to pass this station per month,
@ -168,37 +168,37 @@ public:
* @param station_id The station to get the planned flow for. * @param station_id The station to get the planned flow for.
* @param from_station_id The station the cargo originates at. * @param from_station_id The station the cargo originates at.
* @param via_station_id The next station the cargo will go on to. * @param via_station_id The next station the cargo will go on to.
* @param cargo_id The cargo type to get the planned flow for. * @param cargo_type The cargo type to get the planned flow for.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID. * @pre IsValidStation(from_station_id) || from_station_id == STATION_INVALID.
* @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID. * @pre IsValidStation(via_station_id) || via_station_id == STATION_INVALID.
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return The amount of cargo units from the specified origin planned to pass the station per month, going via the specified next hop. * @return The amount of cargo units from the specified origin planned to pass the station per month, going via the specified next hop.
* @note Cargo planned to go "via" the same station that's being queried is actually planned to be consumed there. * @note Cargo planned to go "via" the same station that's being queried is actually planned to be consumed there.
* @note Cargo planned to pass "from" the same station that's being queried is actually produced there. * @note Cargo planned to pass "from" the same station that's being queried is actually produced there.
*/ */
static SQInteger GetCargoPlannedFromVia(StationID station_id, StationID from_station_id, StationID via_station_id, CargoID cargo_id); static SQInteger GetCargoPlannedFromVia(StationID station_id, StationID from_station_id, StationID via_station_id, CargoType cargo_type);
/** /**
* Check whether the given cargo at the given station a rating. * Check whether the given cargo at the given station a rating.
* @param station_id The station to get the cargo-rating state of. * @param station_id The station to get the cargo-rating state of.
* @param cargo_id The cargo to get the cargo-rating state of. * @param cargo_type The cargo to get the cargo-rating state of.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @return True if the cargo has a rating, otherwise false. * @return True if the cargo has a rating, otherwise false.
*/ */
static bool HasCargoRating(StationID station_id, CargoID cargo_id); static bool HasCargoRating(StationID station_id, CargoType cargo_type);
/** /**
* See how high the rating is of a cargo on a station. * See how high the rating is of a cargo on a station.
* @param station_id The station to get the cargo-rating of. * @param station_id The station to get the cargo-rating of.
* @param cargo_id The cargo to get the cargo-rating of. * @param cargo_type The cargo to get the cargo-rating of.
* @pre IsValidStation(station_id). * @pre IsValidStation(station_id).
* @pre IsValidCargo(cargo_id). * @pre IsValidCargo(cargo_type).
* @pre HasCargoRating(station_id, cargo_id). * @pre HasCargoRating(station_id, cargo_type).
* @return The rating in percent of the cargo on the station. * @return The rating in percent of the cargo on the station.
*/ */
static SQInteger GetCargoRating(StationID station_id, CargoID cargo_id); static SQInteger GetCargoRating(StationID station_id, CargoType cargo_type);
/** /**
* Get the coverage radius of this type of station. * Get the coverage radius of this type of station.
@ -299,15 +299,15 @@ public:
private: private:
template <bool Tfrom, bool Tvia> template <bool Tfrom, bool Tvia>
static bool IsCargoRequestValid(StationID station_id, StationID from_station_id, static bool IsCargoRequestValid(StationID station_id, StationID from_station_id,
StationID via_station_id, CargoID cargo_id); StationID via_station_id, CargoType cargo_type);
template <bool Tfrom, bool Tvia> template <bool Tfrom, bool Tvia>
static SQInteger CountCargoWaiting(StationID station_id, StationID from_station_id, static SQInteger CountCargoWaiting(StationID station_id, StationID from_station_id,
StationID via_station_id, CargoID cargo_id); StationID via_station_id, CargoType cargo_type);
template <bool Tfrom, bool Tvia> template <bool Tfrom, bool Tvia>
static SQInteger CountCargoPlanned(StationID station_id, StationID from_station_id, static SQInteger CountCargoPlanned(StationID station_id, StationID from_station_id,
StationID via_station_id, CargoID cargo_id); StationID via_station_id, CargoType cargo_type);
}; };

30
src/script/api/script_stationlist.cpp
View File

@ -40,7 +40,7 @@ ScriptStationList_Vehicle::ScriptStationList_Vehicle(VehicleID vehicle_id)
} }
ScriptStationList_Cargo::ScriptStationList_Cargo(ScriptStationList_Cargo::CargoMode mode, ScriptStationList_Cargo::ScriptStationList_Cargo(ScriptStationList_Cargo::CargoMode mode,
ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoID cargo, ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoType cargo,
StationID other_station) StationID other_station)
{ {
switch (mode) { switch (mode) {
@ -56,7 +56,7 @@ ScriptStationList_Cargo::ScriptStationList_Cargo(ScriptStationList_Cargo::CargoM
} }
ScriptStationList_CargoWaiting::ScriptStationList_CargoWaiting( ScriptStationList_CargoWaiting::ScriptStationList_CargoWaiting(
ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoID cargo, ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoType cargo,
StationID other_station) StationID other_station)
{ {
switch (selector) { switch (selector) {
@ -78,7 +78,7 @@ ScriptStationList_CargoWaiting::ScriptStationList_CargoWaiting(
} }
ScriptStationList_CargoPlanned::ScriptStationList_CargoPlanned( ScriptStationList_CargoPlanned::ScriptStationList_CargoPlanned(
ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoID cargo, ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoType cargo,
StationID other_station) StationID other_station)
{ {
switch (selector) { switch (selector) {
@ -101,7 +101,7 @@ ScriptStationList_CargoPlanned::ScriptStationList_CargoPlanned(
class CargoCollector { class CargoCollector {
public: public:
CargoCollector(ScriptStationList_Cargo *parent, StationID station_id, CargoID cargo, CargoCollector(ScriptStationList_Cargo *parent, StationID station_id, CargoType cargo,
StationID other); StationID other);
~CargoCollector() ; ~CargoCollector() ;
@ -121,7 +121,7 @@ private:
}; };
CargoCollector::CargoCollector(ScriptStationList_Cargo *parent, CargoCollector::CargoCollector(ScriptStationList_Cargo *parent,
StationID station_id, CargoID cargo, StationID other) : StationID station_id, CargoType cargo, StationID other) :
list(parent), ge(nullptr), other_station(other), last_key(INVALID_STATION), amount(0) list(parent), ge(nullptr), other_station(other), last_key(INVALID_STATION), amount(0)
{ {
if (!ScriptStation::IsValidStation(station_id)) return; if (!ScriptStation::IsValidStation(station_id)) return;
@ -175,7 +175,7 @@ void CargoCollector::Update(StationID from, StationID via, uint amount)
template <ScriptStationList_Cargo::CargoSelector Tselector> template <ScriptStationList_Cargo::CargoSelector Tselector>
void ScriptStationList_CargoWaiting::Add(StationID station_id, CargoID cargo, StationID other_station) void ScriptStationList_CargoWaiting::Add(StationID station_id, CargoType cargo, StationID other_station)
{ {
CargoCollector collector(this, station_id, cargo, other_station); CargoCollector collector(this, station_id, cargo, other_station);
if (collector.GE() == nullptr) return; if (collector.GE() == nullptr) return;
@ -190,7 +190,7 @@ void ScriptStationList_CargoWaiting::Add(StationID station_id, CargoID cargo, St
template <ScriptStationList_Cargo::CargoSelector Tselector> template <ScriptStationList_Cargo::CargoSelector Tselector>
void ScriptStationList_CargoPlanned::Add(StationID station_id, CargoID cargo, StationID other_station) void ScriptStationList_CargoPlanned::Add(StationID station_id, CargoType cargo, StationID other_station)
{ {
CargoCollector collector(this, station_id, cargo, other_station); CargoCollector collector(this, station_id, cargo, other_station);
if (collector.GE() == nullptr) return; if (collector.GE() == nullptr) return;
@ -210,13 +210,13 @@ void ScriptStationList_CargoPlanned::Add(StationID station_id, CargoID cargo, St
} }
ScriptStationList_CargoWaitingByFrom::ScriptStationList_CargoWaitingByFrom(StationID station_id, ScriptStationList_CargoWaitingByFrom::ScriptStationList_CargoWaitingByFrom(StationID station_id,
CargoID cargo) CargoType cargo)
{ {
this->Add<CS_BY_FROM>(station_id, cargo); this->Add<CS_BY_FROM>(station_id, cargo);
} }
ScriptStationList_CargoWaitingViaByFrom::ScriptStationList_CargoWaitingViaByFrom( ScriptStationList_CargoWaitingViaByFrom::ScriptStationList_CargoWaitingViaByFrom(
StationID station_id, CargoID cargo, StationID via) StationID station_id, CargoType cargo, StationID via)
{ {
CargoCollector collector(this, station_id, cargo, via); CargoCollector collector(this, station_id, cargo, via);
if (collector.GE() == nullptr) return; if (collector.GE() == nullptr) return;
@ -231,39 +231,39 @@ ScriptStationList_CargoWaitingViaByFrom::ScriptStationList_CargoWaitingViaByFrom
ScriptStationList_CargoWaitingByVia::ScriptStationList_CargoWaitingByVia(StationID station_id, ScriptStationList_CargoWaitingByVia::ScriptStationList_CargoWaitingByVia(StationID station_id,
CargoID cargo) CargoType cargo)
{ {
this->Add<CS_BY_VIA>(station_id, cargo); this->Add<CS_BY_VIA>(station_id, cargo);
} }
ScriptStationList_CargoWaitingFromByVia::ScriptStationList_CargoWaitingFromByVia( ScriptStationList_CargoWaitingFromByVia::ScriptStationList_CargoWaitingFromByVia(
StationID station_id, CargoID cargo, StationID from) StationID station_id, CargoType cargo, StationID from)
{ {
this->Add<CS_FROM_BY_VIA>(station_id, cargo, from); this->Add<CS_FROM_BY_VIA>(station_id, cargo, from);
} }
ScriptStationList_CargoPlannedByFrom::ScriptStationList_CargoPlannedByFrom(StationID station_id, ScriptStationList_CargoPlannedByFrom::ScriptStationList_CargoPlannedByFrom(StationID station_id,
CargoID cargo) CargoType cargo)
{ {
this->Add<CS_BY_FROM>(station_id, cargo); this->Add<CS_BY_FROM>(station_id, cargo);
} }
ScriptStationList_CargoPlannedViaByFrom::ScriptStationList_CargoPlannedViaByFrom( ScriptStationList_CargoPlannedViaByFrom::ScriptStationList_CargoPlannedViaByFrom(
StationID station_id, CargoID cargo, StationID via) StationID station_id, CargoType cargo, StationID via)
{ {
this->Add<CS_VIA_BY_FROM>(station_id, cargo, via); this->Add<CS_VIA_BY_FROM>(station_id, cargo, via);
} }
ScriptStationList_CargoPlannedByVia::ScriptStationList_CargoPlannedByVia(StationID station_id, ScriptStationList_CargoPlannedByVia::ScriptStationList_CargoPlannedByVia(StationID station_id,
CargoID cargo) CargoType cargo)
{ {
this->Add<CS_BY_VIA>(station_id, cargo); this->Add<CS_BY_VIA>(station_id, cargo);
} }
ScriptStationList_CargoPlannedFromByVia::ScriptStationList_CargoPlannedFromByVia( ScriptStationList_CargoPlannedFromByVia::ScriptStationList_CargoPlannedFromByVia(
StationID station_id, CargoID cargo, StationID from) StationID station_id, CargoType cargo, StationID from)
{ {
CargoCollector collector(this, station_id, cargo, from); CargoCollector collector(this, station_id, cargo, from);
if (collector.GE() == nullptr) return; if (collector.GE() == nullptr) return;

26
src/script/api/script_stationlist.hpp
View File

@ -61,7 +61,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param other_station Other station to restrict the query with. * @param other_station Other station to restrict the query with.
*/ */
ScriptStationList_Cargo(ScriptStationList_Cargo::CargoMode mode, ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoID cargo, StationID other_station); ScriptStationList_Cargo(ScriptStationList_Cargo::CargoMode mode, ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoType cargo, StationID other_station);
protected: protected:
@ -93,7 +93,7 @@ protected:
* @param other_station Other station to restrict the query with. * @param other_station Other station to restrict the query with.
*/ */
template <CargoSelector Tselector> template <CargoSelector Tselector>
void Add(StationID station_id, CargoID cargo, StationID other_station = INVALID_STATION); void Add(StationID station_id, CargoType cargo, StationID other_station = INVALID_STATION);
public: public:
@ -105,7 +105,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param other_station Other station to restrict the query with. * @param other_station Other station to restrict the query with.
*/ */
ScriptStationList_CargoWaiting(ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoID cargo, StationID other_station); ScriptStationList_CargoWaiting(ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoType cargo, StationID other_station);
}; };
/** /**
@ -130,7 +130,7 @@ protected:
* @param other_station Other station to restrict the query with. * @param other_station Other station to restrict the query with.
*/ */
template <CargoSelector Tselector> template <CargoSelector Tselector>
void Add(StationID station_id, CargoID cargo, StationID other_station = INVALID_STATION); void Add(StationID station_id, CargoType cargo, StationID other_station = INVALID_STATION);
public: public:
@ -142,7 +142,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param other_station Other station to restrict the query with. * @param other_station Other station to restrict the query with.
*/ */
ScriptStationList_CargoPlanned(ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoID cargo, StationID other_station); ScriptStationList_CargoPlanned(ScriptStationList_Cargo::CargoSelector selector, StationID station_id, CargoType cargo, StationID other_station);
}; };
/** /**
@ -157,7 +157,7 @@ public:
* @param station_id Station to query for waiting cargo. * @param station_id Station to query for waiting cargo.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
*/ */
ScriptStationList_CargoWaitingByFrom(StationID station_id, CargoID cargo); ScriptStationList_CargoWaitingByFrom(StationID station_id, CargoType cargo);
}; };
/** /**
@ -173,7 +173,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param via Next hop to restrict the query with. * @param via Next hop to restrict the query with.
*/ */
ScriptStationList_CargoWaitingViaByFrom(StationID station_id, CargoID cargo, StationID via); ScriptStationList_CargoWaitingViaByFrom(StationID station_id, CargoType cargo, StationID via);
}; };
/** /**
@ -188,7 +188,7 @@ public:
* @param station_id Station to query for waiting cargo. * @param station_id Station to query for waiting cargo.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
*/ */
ScriptStationList_CargoWaitingByVia(StationID station_id, CargoID cargo); ScriptStationList_CargoWaitingByVia(StationID station_id, CargoType cargo);
}; };
/** /**
@ -204,7 +204,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param from Origin station to restrict the query with. * @param from Origin station to restrict the query with.
*/ */
ScriptStationList_CargoWaitingFromByVia(StationID station_id, CargoID cargo, StationID from); ScriptStationList_CargoWaitingFromByVia(StationID station_id, CargoType cargo, StationID from);
}; };
/** /**
@ -219,7 +219,7 @@ public:
* @param station_id Station to query for planned flows. * @param station_id Station to query for planned flows.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
*/ */
ScriptStationList_CargoPlannedByFrom(StationID station_id, CargoID cargo); ScriptStationList_CargoPlannedByFrom(StationID station_id, CargoType cargo);
}; };
/** /**
@ -235,7 +235,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param via Next hop to restrict the query with. * @param via Next hop to restrict the query with.
*/ */
ScriptStationList_CargoPlannedViaByFrom(StationID station_id, CargoID cargo, StationID via); ScriptStationList_CargoPlannedViaByFrom(StationID station_id, CargoType cargo, StationID via);
}; };
/** /**
@ -251,7 +251,7 @@ public:
* @param station_id Station to query for planned flows. * @param station_id Station to query for planned flows.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
*/ */
ScriptStationList_CargoPlannedByVia(StationID station_id, CargoID cargo); ScriptStationList_CargoPlannedByVia(StationID station_id, CargoType cargo);
}; };
/** /**
@ -268,7 +268,7 @@ public:
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param from Origin station to restrict the query with. * @param from Origin station to restrict the query with.
*/ */
ScriptStationList_CargoPlannedFromByVia(StationID station_id, CargoID cargo, StationID from); ScriptStationList_CargoPlannedFromByVia(StationID station_id, CargoType cargo, StationID from);
}; };
/** /**

4
src/script/api/script_subsidy.cpp
View File

@ -31,7 +31,7 @@
return ::Subsidy::Get(subsidy_id)->IsAwarded(); return ::Subsidy::Get(subsidy_id)->IsAwarded();
} }
/* static */ bool ScriptSubsidy::Create(CargoID cargo_type, SubsidyParticipantType from_type, SQInteger from_id, SubsidyParticipantType to_type, SQInteger to_id) /* static */ bool ScriptSubsidy::Create(CargoType cargo_type, SubsidyParticipantType from_type, SQInteger from_id, SubsidyParticipantType to_type, SQInteger to_id)
{ {
EnforceDeityMode(false); EnforceDeityMode(false);
EnforcePrecondition(false, ScriptCargo::IsValidCargo(cargo_type)); EnforcePrecondition(false, ScriptCargo::IsValidCargo(cargo_type));
@ -63,7 +63,7 @@
return (ScriptDate::Date)TimerGameEconomy::ConvertYMDToDate(ymd.year, ymd.month, ymd.day).base(); return (ScriptDate::Date)TimerGameEconomy::ConvertYMDToDate(ymd.year, ymd.month, ymd.day).base();
} }
/* static */ CargoID ScriptSubsidy::GetCargoType(SubsidyID subsidy_id) /* static */ CargoType ScriptSubsidy::GetCargoType(SubsidyID subsidy_id)
{ {
if (!IsValidSubsidy(subsidy_id)) return INVALID_CARGO; if (!IsValidSubsidy(subsidy_id)) return INVALID_CARGO;

4
src/script/api/script_subsidy.hpp
View File

@ -63,7 +63,7 @@ public:
* @pre (to_type == SPT_INDUSTRY && ScriptIndustry::IsValidIndustry(to_id)) || (to_type == SPT_TOWN && ScriptTown::IsValidTown(to_id)) * @pre (to_type == SPT_INDUSTRY && ScriptIndustry::IsValidIndustry(to_id)) || (to_type == SPT_TOWN && ScriptTown::IsValidTown(to_id))
* @api -ai * @api -ai
*/ */
static bool Create(CargoID cargo_type, SubsidyParticipantType from_type, SQInteger from_id, SubsidyParticipantType to_type, SQInteger to_id); static bool Create(CargoType cargo_type, SubsidyParticipantType from_type, SQInteger from_id, SubsidyParticipantType to_type, SQInteger to_id);
/** /**
* Get the company index of the company this subsidy is awarded to. * Get the company index of the company this subsidy is awarded to.
@ -93,7 +93,7 @@ public:
* @pre IsValidSubsidy(subsidy_id). * @pre IsValidSubsidy(subsidy_id).
* @return The cargo type to transport. * @return The cargo type to transport.
*/ */
static CargoID GetCargoType(SubsidyID subsidy_id); static CargoType GetCargoType(SubsidyID subsidy_id);
/** /**
* Returns the type of source of subsidy. * Returns the type of source of subsidy.

4
src/script/api/script_tile.cpp
View File

@ -224,7 +224,7 @@
} }
} }
/* static */ SQInteger ScriptTile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, SQInteger width, SQInteger height, SQInteger radius) /* static */ SQInteger ScriptTile::GetCargoAcceptance(TileIndex tile, CargoType cargo_type, SQInteger width, SQInteger height, SQInteger radius)
{ {
if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !ScriptCargo::IsValidCargo(cargo_type)) return -1; if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !ScriptCargo::IsValidCargo(cargo_type)) return -1;
@ -232,7 +232,7 @@
return acceptance[cargo_type]; return acceptance[cargo_type];
} }
/* static */ SQInteger ScriptTile::GetCargoProduction(TileIndex tile, CargoID cargo_type, SQInteger width, SQInteger height, SQInteger radius) /* static */ SQInteger ScriptTile::GetCargoProduction(TileIndex tile, CargoType cargo_type, SQInteger width, SQInteger height, SQInteger radius)
{ {
if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !ScriptCargo::IsValidCargo(cargo_type)) return -1; if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !ScriptCargo::IsValidCargo(cargo_type)) return -1;

4
src/script/api/script_tile.hpp
View File

@ -376,7 +376,7 @@ public:
* @pre radius >= 0. * @pre radius >= 0.
* @return Values below 8 mean no acceptance; the more the better. * @return Values below 8 mean no acceptance; the more the better.
*/ */
static SQInteger GetCargoAcceptance(TileIndex tile, CargoID cargo_type, SQInteger width, SQInteger height, SQInteger radius); static SQInteger GetCargoAcceptance(TileIndex tile, CargoType cargo_type, SQInteger width, SQInteger height, SQInteger radius);
/** /**
* Checks how many producers in the radius produces this cargo. * Checks how many producers in the radius produces this cargo.
@ -393,7 +393,7 @@ public:
* @pre radius >= 0. * @pre radius >= 0.
* @return The number of producers that produce this cargo within radius of the tile. * @return The number of producers that produce this cargo within radius of the tile.
*/ */
static SQInteger GetCargoProduction(TileIndex tile, CargoID cargo_type, SQInteger width, SQInteger height, SQInteger radius); static SQInteger GetCargoProduction(TileIndex tile, CargoType cargo_type, SQInteger width, SQInteger height, SQInteger radius);
/** /**
* Get the manhattan distance from the tile to the tile. * Get the manhattan distance from the tile to the tile.

2
src/script/api/script_tilelist.cpp
View File

@ -95,7 +95,7 @@ ScriptTileList_IndustryAccepting::ScriptTileList_IndustryAccepting(IndustryID in
/* Only add the tile if it accepts the cargo (sometimes just 1 tile of an /* Only add the tile if it accepts the cargo (sometimes just 1 tile of an
* industry triggers the acceptance). */ * industry triggers the acceptance). */
CargoArray acceptance = ::GetAcceptanceAroundTiles(cur_tile, 1, 1, radius); CargoArray acceptance = ::GetAcceptanceAroundTiles(cur_tile, 1, 1, radius);
if (std::none_of(std::begin(i->accepted), std::end(i->accepted), [&acceptance](const auto &a) { return ::IsValidCargoID(a.cargo) && acceptance[a.cargo] != 0; })) continue; if (std::none_of(std::begin(i->accepted), std::end(i->accepted), [&acceptance](const auto &a) { return ::IsValidCargoType(a.cargo) && acceptance[a.cargo] != 0; })) continue;
this->AddTile(cur_tile); this->AddTile(cur_tile);
} }

18
src/script/api/script_town.cpp
View File

@ -86,33 +86,33 @@
return t->xy; return t->xy;
} }
/* static */ SQInteger ScriptTown::GetLastMonthProduction(TownID town_id, CargoID cargo_id) /* static */ SQInteger ScriptTown::GetLastMonthProduction(TownID town_id, CargoType cargo_type)
{ {
if (!IsValidTown(town_id)) return -1; if (!IsValidTown(town_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Town *t = ::Town::Get(town_id); const Town *t = ::Town::Get(town_id);
return t->supplied[cargo_id].old_max; return t->supplied[cargo_type].old_max;
} }
/* static */ SQInteger ScriptTown::GetLastMonthSupplied(TownID town_id, CargoID cargo_id) /* static */ SQInteger ScriptTown::GetLastMonthSupplied(TownID town_id, CargoType cargo_type)
{ {
if (!IsValidTown(town_id)) return -1; if (!IsValidTown(town_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Town *t = ::Town::Get(town_id); const Town *t = ::Town::Get(town_id);
return t->supplied[cargo_id].old_act; return t->supplied[cargo_type].old_act;
} }
/* static */ SQInteger ScriptTown::GetLastMonthTransportedPercentage(TownID town_id, CargoID cargo_id) /* static */ SQInteger ScriptTown::GetLastMonthTransportedPercentage(TownID town_id, CargoType cargo_type)
{ {
if (!IsValidTown(town_id)) return -1; if (!IsValidTown(town_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo_type)) return -1;
const Town *t = ::Town::Get(town_id); const Town *t = ::Town::Get(town_id);
return ::ToPercent8(t->GetPercentTransported(cargo_id)); return ::ToPercent8(t->GetPercentTransported(cargo_type));
} }
/* static */ SQInteger ScriptTown::GetLastMonthReceived(TownID town_id, ScriptCargo::TownEffect towneffect_id) /* static */ SQInteger ScriptTown::GetLastMonthReceived(TownID town_id, ScriptCargo::TownEffect towneffect_id)

20
src/script/api/script_town.hpp
View File

@ -196,42 +196,42 @@ public:
/** /**
* Get the total last economy-month's production of the given cargo at a town. * Get the total last economy-month's production of the given cargo at a town.
* @param town_id The index of the town. * @param town_id The index of the town.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The last economy-month's production of the given cargo for this town. * @return The last economy-month's production of the given cargo for this town.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */
static SQInteger GetLastMonthProduction(TownID town_id, CargoID cargo_id); static SQInteger GetLastMonthProduction(TownID town_id, CargoType cargo_type);
/** /**
* Get the total amount of cargo supplied from a town last economy-month. * Get the total amount of cargo supplied from a town last economy-month.
* @param town_id The index of the town. * @param town_id The index of the town.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The amount of cargo supplied for transport from this town last economy-month. * @return The amount of cargo supplied for transport from this town last economy-month.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */
static SQInteger GetLastMonthSupplied(TownID town_id, CargoID cargo_id); static SQInteger GetLastMonthSupplied(TownID town_id, CargoType cargo_type);
/** /**
* Get the percentage of transported production of the given cargo at a town last economy-month. * Get the percentage of transported production of the given cargo at a town last economy-month.
* @param town_id The index of the town. * @param town_id The index of the town.
* @param cargo_id The index of the cargo. * @param cargo_type The index of the cargo.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).
* @pre ScriptCargo::IsValidCargo(cargo_id). * @pre ScriptCargo::IsValidCargo(cargo_type).
* @return The percentage of given cargo transported from this town last economy-month. * @return The percentage of given cargo transported from this town last economy-month.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */
static SQInteger GetLastMonthTransportedPercentage(TownID town_id, CargoID cargo_id); static SQInteger GetLastMonthTransportedPercentage(TownID town_id, CargoType cargo_type);
/** /**
* Get the total amount of cargo effects received by a town last economy-month. * Get the total amount of cargo effects received by a town last economy-month.
* @param town_id The index of the town. * @param town_id The index of the town.
* @param towneffect_id The index of the cargo. * @param towneffect_id The index of the cargo.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).
* @pre ScriptCargo::IsValidTownEffect(cargo_id). * @pre ScriptCargo::IsValidTownEffect(cargo_type).
* @return The amount of cargo received by this town last economy-month for this cargo effect. * @return The amount of cargo received by this town last economy-month for this cargo effect.
* @see \ref ScriptEconomyTime * @see \ref ScriptEconomyTime
*/ */

4
src/script/api/script_types.hpp
View File

@ -25,7 +25,7 @@
* <td> introduction \ref newgrf_changes "(1)" </td> * <td> introduction \ref newgrf_changes "(1)" </td>
* <td> never \ref newgrf_changes "(1)" </td> * <td> never \ref newgrf_changes "(1)" </td>
* <td> no \ref newgrf_changes "(1)" </td></tr> * <td> no \ref newgrf_changes "(1)" </td></tr>
* <tr><td>#CargoID </td><td> cargo type </td> * <tr><td>#CargoType </td><td> cargo type </td>
* <td> game start \ref newgrf_changes "(1)" </td> * <td> game start \ref newgrf_changes "(1)" </td>
* <td> never \ref newgrf_changes "(1)" </td> * <td> never \ref newgrf_changes "(1)" </td>
* <td> no \ref newgrf_changes "(1)" </td></tr> * <td> no \ref newgrf_changes "(1)" </td></tr>
@ -111,7 +111,7 @@
/* Define all types here, so they are added to the API docs. */ /* Define all types here, so they are added to the API docs. */
typedef uint BridgeType; ///< The ID of a bridge type. typedef uint BridgeType; ///< The ID of a bridge type.
typedef uint8_t CargoID; ///< The ID of a cargo. typedef uint8_t CargoType; ///< The ID of a cargo type.
typedef uint16_t EngineID; ///< The ID of an engine. typedef uint16_t EngineID; ///< The ID of an engine.
typedef uint16_t GoalID; ///< The ID of a goal. typedef uint16_t GoalID; ///< The ID of a goal.
typedef uint16_t GroupID; ///< The ID of a group. typedef uint16_t GroupID; ///< The ID of a group.

16
src/script/api/script_vehicle.cpp
View File

@ -71,11 +71,11 @@
return v->IsGroundVehicle() ? v->GetGroundVehicleCache()->cached_total_length : -1; return v->IsGroundVehicle() ? v->GetGroundVehicleCache()->cached_total_length : -1;
} }
/* static */ VehicleID ScriptVehicle::_BuildVehicleInternal(TileIndex depot, EngineID engine_id, CargoID cargo) /* static */ VehicleID ScriptVehicle::_BuildVehicleInternal(TileIndex depot, EngineID engine_id, CargoType cargo)
{ {
EnforceCompanyModeValid(VEHICLE_INVALID); EnforceCompanyModeValid(VEHICLE_INVALID);
EnforcePrecondition(VEHICLE_INVALID, ScriptEngine::IsBuildable(engine_id)); EnforcePrecondition(VEHICLE_INVALID, ScriptEngine::IsBuildable(engine_id));
EnforcePrecondition(VEHICLE_INVALID, !::IsValidCargoID(cargo) || ScriptCargo::IsValidCargo(cargo)); EnforcePrecondition(VEHICLE_INVALID, !::IsValidCargoType(cargo) || ScriptCargo::IsValidCargo(cargo));
::VehicleType type = ::Engine::Get(engine_id)->type; ::VehicleType type = ::Engine::Get(engine_id)->type;
@ -92,13 +92,13 @@
return _BuildVehicleInternal(depot, engine_id, INVALID_CARGO); return _BuildVehicleInternal(depot, engine_id, INVALID_CARGO);
} }
/* static */ VehicleID ScriptVehicle::BuildVehicleWithRefit(TileIndex depot, EngineID engine_id, CargoID cargo) /* static */ VehicleID ScriptVehicle::BuildVehicleWithRefit(TileIndex depot, EngineID engine_id, CargoType cargo)
{ {
EnforcePrecondition(VEHICLE_INVALID, ScriptCargo::IsValidCargo(cargo)); EnforcePrecondition(VEHICLE_INVALID, ScriptCargo::IsValidCargo(cargo));
return _BuildVehicleInternal(depot, engine_id, cargo); return _BuildVehicleInternal(depot, engine_id, cargo);
} }
/* static */ SQInteger ScriptVehicle::GetBuildWithRefitCapacity(TileIndex depot, EngineID engine_id, CargoID cargo) /* static */ SQInteger ScriptVehicle::GetBuildWithRefitCapacity(TileIndex depot, EngineID engine_id, CargoType cargo)
{ {
if (!ScriptEngine::IsBuildable(engine_id)) return -1; if (!ScriptEngine::IsBuildable(engine_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo)) return -1; if (!ScriptCargo::IsValidCargo(cargo)) return -1;
@ -147,7 +147,7 @@
return _MoveWagonInternal(source_vehicle_id, source_wagon, true, dest_vehicle_id, dest_wagon); return _MoveWagonInternal(source_vehicle_id, source_wagon, true, dest_vehicle_id, dest_wagon);
} }
/* static */ SQInteger ScriptVehicle::GetRefitCapacity(VehicleID vehicle_id, CargoID cargo) /* static */ SQInteger ScriptVehicle::GetRefitCapacity(VehicleID vehicle_id, CargoType cargo)
{ {
if (!IsValidVehicle(vehicle_id)) return -1; if (!IsValidVehicle(vehicle_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo)) return -1; if (!ScriptCargo::IsValidCargo(cargo)) return -1;
@ -156,7 +156,7 @@
return res.Succeeded() ? refit_capacity : -1; return res.Succeeded() ? refit_capacity : -1;
} }
/* static */ bool ScriptVehicle::RefitVehicle(VehicleID vehicle_id, CargoID cargo) /* static */ bool ScriptVehicle::RefitVehicle(VehicleID vehicle_id, CargoType cargo)
{ {
EnforceCompanyModeValid(false); EnforceCompanyModeValid(false);
EnforcePrecondition(false, IsValidVehicle(vehicle_id) && ScriptCargo::IsValidCargo(cargo)); EnforcePrecondition(false, IsValidVehicle(vehicle_id) && ScriptCargo::IsValidCargo(cargo));
@ -412,7 +412,7 @@
return (ScriptRoad::RoadType)(int)(::RoadVehicle::Get(vehicle_id))->roadtype; return (ScriptRoad::RoadType)(int)(::RoadVehicle::Get(vehicle_id))->roadtype;
} }
/* static */ SQInteger ScriptVehicle::GetCapacity(VehicleID vehicle_id, CargoID cargo) /* static */ SQInteger ScriptVehicle::GetCapacity(VehicleID vehicle_id, CargoType cargo)
{ {
if (!IsValidVehicle(vehicle_id)) return -1; if (!IsValidVehicle(vehicle_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo)) return -1; if (!ScriptCargo::IsValidCargo(cargo)) return -1;
@ -425,7 +425,7 @@
return amount; return amount;
} }
/* static */ SQInteger ScriptVehicle::GetCargoLoad(VehicleID vehicle_id, CargoID cargo) /* static */ SQInteger ScriptVehicle::GetCargoLoad(VehicleID vehicle_id, CargoType cargo)
{ {
if (!IsValidVehicle(vehicle_id)) return -1; if (!IsValidVehicle(vehicle_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo)) return -1; if (!ScriptCargo::IsValidCargo(cargo)) return -1;

14
src/script/api/script_vehicle.hpp
View File

@ -357,7 +357,7 @@ public:
* as the vehicle isn't really built yet. Build it for real first before * as the vehicle isn't really built yet. Build it for real first before
* assigning orders. * assigning orders.
*/ */
static VehicleID BuildVehicleWithRefit(TileIndex depot, EngineID engine_id, CargoID cargo); static VehicleID BuildVehicleWithRefit(TileIndex depot, EngineID engine_id, CargoType cargo);
/** /**
* Gets the capacity of a vehicle built at the given depot with the given engine and refitted to the given cargo. * Gets the capacity of a vehicle built at the given depot with the given engine and refitted to the given cargo.
@ -370,7 +370,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo). * @pre ScriptCargo::IsValidCargo(cargo).
* @return The capacity the vehicle will have when refited. * @return The capacity the vehicle will have when refited.
*/ */
static SQInteger GetBuildWithRefitCapacity(TileIndex depot, EngineID engine_id, CargoID cargo); static SQInteger GetBuildWithRefitCapacity(TileIndex depot, EngineID engine_id, CargoType cargo);
/** /**
* Clones a vehicle at the given depot, copying or cloning its orders. * Clones a vehicle at the given depot, copying or cloning its orders.
@ -431,7 +431,7 @@ public:
* @pre The vehicle must be stopped in the depot. * @pre The vehicle must be stopped in the depot.
* @return The capacity the vehicle will have when refited. * @return The capacity the vehicle will have when refited.
*/ */
static SQInteger GetRefitCapacity(VehicleID vehicle_id, CargoID cargo); static SQInteger GetRefitCapacity(VehicleID vehicle_id, CargoType cargo);
/** /**
* Refits a vehicle to the given cargo type. * Refits a vehicle to the given cargo type.
@ -447,7 +447,7 @@ public:
* @exception ScriptVehicle::ERR_VEHICLE_NOT_IN_DEPOT * @exception ScriptVehicle::ERR_VEHICLE_NOT_IN_DEPOT
* @return True if and only if the refit succeeded. * @return True if and only if the refit succeeded.
*/ */
static bool RefitVehicle(VehicleID vehicle_id, CargoID cargo); static bool RefitVehicle(VehicleID vehicle_id, CargoType cargo);
/** /**
* Sells the given vehicle. * Sells the given vehicle.
@ -546,7 +546,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo). * @pre ScriptCargo::IsValidCargo(cargo).
* @return The maximum amount of the given cargo the vehicle can transport. * @return The maximum amount of the given cargo the vehicle can transport.
*/ */
static SQInteger GetCapacity(VehicleID vehicle_id, CargoID cargo); static SQInteger GetCapacity(VehicleID vehicle_id, CargoType cargo);
/** /**
* Get the length of a the total vehicle in 1/16's of a tile. * Get the length of a the total vehicle in 1/16's of a tile.
@ -565,7 +565,7 @@ public:
* @pre ScriptCargo::IsValidCargo(cargo). * @pre ScriptCargo::IsValidCargo(cargo).
* @return The amount of the given cargo the vehicle is currently transporting. * @return The amount of the given cargo the vehicle is currently transporting.
*/ */
static SQInteger GetCargoLoad(VehicleID vehicle_id, CargoID cargo); static SQInteger GetCargoLoad(VehicleID vehicle_id, CargoType cargo);
/** /**
* Get the group of a given vehicle. * Get the group of a given vehicle.
@ -619,7 +619,7 @@ private:
/** /**
* Internal function used by BuildVehicle(WithRefit). * Internal function used by BuildVehicle(WithRefit).
*/ */
static VehicleID _BuildVehicleInternal(TileIndex depot, EngineID engine_id, CargoID cargo); static VehicleID _BuildVehicleInternal(TileIndex depot, EngineID engine_id, CargoType cargo);
/** /**
* Internal function used by SellWagon(Chain). * Internal function used by SellWagon(Chain).

Some files were not shown because too many files have changed in this diff Show More