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

Remove various uses of lengthof on std::array

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-04-08 19:55:58 +01:00
parent 919830db7a
commit 28e74005d0
15 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/subsidy.cpp
View File

@@ -406,12 +406,12 @@ bool FindSubsidyIndustryCargoRoute()
/* Randomize cargo type */
int num_cargos = 0;
uint cargo_index;
for (cargo_index = 0; cargo_index < lengthof(src_ind->produced_cargo); cargo_index++) {
for (cargo_index = 0; cargo_index < std::size(src_ind->produced_cargo); cargo_index++) {
if (src_ind->produced_cargo[cargo_index] != INVALID_CARGO) num_cargos++;
}
if (num_cargos == 0) return false; // industry produces nothing
int cargo_num = RandomRange(num_cargos) + 1;
for (cargo_index = 0; cargo_index < lengthof(src_ind->produced_cargo); cargo_index++) {
for (cargo_index = 0; cargo_index < std::size(src_ind->produced_cargo); cargo_index++) {
if (src_ind->produced_cargo[cargo_index] != INVALID_CARGO) cargo_num--;
if (cargo_num == 0) break;
}