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

Add cargo mask of town production cargoes

Browse Source 
Use for all non-GUI cases (where display sort order is not required)
This commit is contained in:
Jonathan G Rennison
2024-02-19 03:49:35 +00:00
parent 8581808952
commit 19e4895ffd
6 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/subsidy.cpp
View File

@@ -293,9 +293,18 @@ bool FindSubsidyPassengerRoute()
{
if (!Subsidy::CanAllocateItem()) return false;
if (CargoSpec::town_production_cargo_mask[TPE_PASSENGERS] == 0) return false;
/* Pick a random TPE_PASSENGER type */
uint32_t r = RandomRange(static_cast<uint>(CargoSpec::town_production_cargoes[TPE_PASSENGERS].size()));
CargoID cid = CargoSpec::town_production_cargoes[TPE_PASSENGERS][r]->Index();
uint32_t r = RandomRange(CountBits(CargoSpec::town_production_cargo_mask[TPE_PASSENGERS]));
CargoID cid{};
for (CargoID cargo_id : SetCargoBitIterator(CargoSpec::town_production_cargo_mask[TPE_PASSENGERS])) {
if (r == 0) {
cid = cargo_id;
break;
}
r--;
}
const Town *src = Town::GetRandom();
if (src->cache.population < SUBSIDY_PAX_MIN_POPULATION ||
@@ -343,8 +352,8 @@ bool FindSubsidyTownCargoRoute()
}
/* Passenger subsidies are not handled here. */
for (const CargoSpec *cs : CargoSpec::town_production_cargoes[TPE_PASSENGERS]) {
town_cargo_produced[cs->Index()] = 0;
for (CargoID cid : SetCargoBitIterator(CargoSpec::town_production_cargo_mask[TPE_PASSENGERS])) {
town_cargo_produced[cid] = 0;
}
uint8_t cargo_count = town_cargo_produced.GetCount();