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

Codechange: Use new function to get a bitmask of empty cargo types.

Browse Source
This commit is contained in:
Peter Nelson
2023-09-21 08:38:46 +01:00
committed by PeterN
parent 69ee38bd43
commit 398c7e5f9d
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf_station.cpp
View File

@@ -962,15 +962,8 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
uint32_t whole_reseed = 0;
ETileArea area = ETileArea(st, trigger_tile, tas[trigger]);
CargoTypes empty_mask = 0;
if (trigger == SRT_CARGO_TAKEN) {
/* Create a bitmask of completely empty cargo types to be matched */
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (st->goods[i].cargo.TotalCount() == 0) {
SetBit(empty_mask, i);
}
}
}
/* Bitmask of completely empty cargo types to be matched. */
CargoTypes empty_mask = (trigger == SRT_CARGO_TAKEN) ? GetEmptyMask(st) : 0;
/* Store triggers now for var 5F */
SetBit(st->waiting_triggers, trigger);