amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: use EnumBitSet for CargoTypes

Browse Source
This commit is contained in:
Peter Nelson
2026-04-21 17:13:31 +01:00
committed by Peter Nelson
parent 962a550d1b
commit c45aa3c9b6
55 changed files with 278 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/town_gui.cpp
+4 -4
View File
@@ -1641,12 +1641,12 @@ static CargoTypes GetProducedCargoOfHouse(const HouseSpec *hs)
uint amt = GB(callback, 0, 8);
if (amt == 0) continue;
SetBit(produced, cargo);
produced.Set(cargo);
}
} else {
/* Cargo is not controlled by NewGRF, town production effect is used instead. */
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TownProductionEffect::Passengers]) SetBit(produced, cs->Index());
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TownProductionEffect::Mail]) SetBit(produced, cs->Index());
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TownProductionEffect::Passengers]) produced.Set(cs->Index());
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TownProductionEffect::Mail]) produced.Set(cs->Index());
}
return produced;
}
@@ -1733,7 +1733,7 @@ struct BuildHouseWindow : public PickerWindow {
}
CargoTypes produced = GetProducedCargoOfHouse(hs);
if (produced != 0) {
if (produced.Any()) {
line << "\n";
line << GetString(STR_HOUSE_PICKER_CARGO_PRODUCED, produced);
}