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

Codechange: Rename INVALID_CARGO to INVALID_CARGO_BITNUM

Browse Source 
... to avoid future ambiguity.
This commit is contained in:
Peter Nelson
2023-05-23 08:35:47 +01:00
committed by PeterN
parent 9d1b131c44
commit 14bcfff6f5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cargotype.cpp
View File

@@ -44,7 +44,7 @@ void SetupCargoForClimate(LandscapeID l)
/* Reset and disable all cargo types */
for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) {
*CargoSpec::Get(i) = {};
CargoSpec::Get(i)->bitnum = INVALID_CARGO;
CargoSpec::Get(i)->bitnum = INVALID_CARGO_BITNUM;
/* Set defaults for newer properties, which old GRFs do not know */
CargoSpec::Get(i)->multiplier = 0x100;
@@ -60,7 +60,7 @@ void SetupCargoForClimate(LandscapeID l)
/* Copy the indexed cargo */
CargoSpec *cargo = CargoSpec::Get(i);
*cargo = _default_cargo[cl];
if (cargo->bitnum != INVALID_CARGO) SetBit(_cargo_mask, i);
if (cargo->bitnum != INVALID_CARGO_BITNUM) SetBit(_cargo_mask, i);
continue;
}
@@ -123,7 +123,7 @@ CargoID GetCargoIDByLabel(CargoLabel cl)
*/
CargoID GetCargoIDByBitnum(uint8_t bitnum)
{
if (bitnum == INVALID_CARGO) return CT_INVALID;
if (bitnum == INVALID_CARGO_BITNUM) return CT_INVALID;
for (const CargoSpec *cs : CargoSpec::Iterate()) {
if (cs->bitnum == bitnum) return cs->Index();