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

Cleanup: Replace FOR_ALL_SORTED_CARGOSPECS macro with range iterator.

Browse Source 
(cherry picked from commit 20ac0b4148)
This commit is contained in:
Peter Nelson
2021-04-28 21:50:46 +01:00
committed by Jonathan G Rennison
parent 5e1b4e1844
commit 4fc433c871
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cargotype.h
View File

@@ -159,13 +159,6 @@ static inline bool IsCargoInClass(CargoID c, CargoClass cc)
#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.
* @param var Reference getting the cargospec.
* @see CargoSpec
*/
#define FOR_ALL_SORTED_CARGOSPECS(var) for (uint8 index = 0; index < _sorted_cargo_specs.size() && (var = _sorted_cargo_specs[index], true) ; index++)
/**
* Loop header for iterating over 'real' cargoes, sorted by name. Phony cargoes like regearing cargoes are skipped.
* @param var Reference getting the cargospec.