diff options
author | PeterN <peter@fuzzle.org> | 2018-05-21 22:08:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-21 22:08:39 +0100 |
commit | 4cebebcf683b079ff010e70b0a0a78c12734933e (patch) | |
tree | 4f140272bd8c1efba4916a642b85a22f153cb7b4 /src/cargotype.h | |
parent | 42b43c998314a3fcd89aa59ad7834104dd80b053 (diff) | |
download | openttd-4cebebcf683b079ff010e70b0a0a78c12734933e.tar.xz |
Change: Add CargoTypes type for cargo masks. (#6790)
Diffstat (limited to 'src/cargotype.h')
-rw-r--r-- | src/cargotype.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cargotype.h b/src/cargotype.h index fee461d7f..71cd932bb 100644 --- a/src/cargotype.h +++ b/src/cargotype.h @@ -129,8 +129,8 @@ private: friend void SetupCargoForClimate(LandscapeID l); }; -extern uint32 _cargo_mask; -extern uint32 _standard_cargo_mask; +extern CargoTypes _cargo_mask; +extern CargoTypes _standard_cargo_mask; void SetupCargoForClimate(LandscapeID l); CargoID GetCargoIDByLabel(CargoLabel cl); @@ -156,7 +156,7 @@ static inline bool IsCargoInClass(CargoID c, CargoClass cc) if ((var = CargoSpec::Get(cargospec_index))->IsValid()) #define FOR_ALL_CARGOSPECS(var) FOR_ALL_CARGOSPECS_FROM(var, 0) -#define FOR_EACH_SET_CARGO_ID(var, cargo_bits) FOR_EACH_SET_BIT_EX(CargoID, var, uint, cargo_bits) +#define FOR_EACH_SET_CARGO_ID(var, cargo_bits) FOR_EACH_SET_BIT_EX(CargoID, var, CargoTypes, cargo_bits) /** * Loop header for iterating over cargoes, sorted by name. This includes phony cargoes like regearing cargoes. |