mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use range-for to simplify getting first non-zero value. 

This reduces indexed array access.
pull/11514/head
Peter Nelson 2023-11-26 21:30:31 +00:00 committed by Peter Nelson
parent 4181d3c1ff
commit 3f853d8003
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/api/script_engine.cpp
View File

@ -94,9 +94,8 @@
case VEH_ROAD: case VEH_ROAD:
case VEH_TRAIN: { case VEH_TRAIN: {
CargoArray capacities = GetCapacityOfArticulatedParts(engine_id); CargoArray capacities = GetCapacityOfArticulatedParts(engine_id);
for (CargoID c = 0; c < NUM_CARGO; c++) { for (uint &cap : capacities) {
if (capacities[c] == 0) continue; if (cap != 0) return cap;
return capacities[c];
} }
return -1; return -1;
} }

5
src/script/api/script_event_types.cpp
View File

@ -62,9 +62,8 @@ int32_t ScriptEventEnginePreview::GetCapacity()
case VEH_ROAD: case VEH_ROAD:
case VEH_TRAIN: { case VEH_TRAIN: {
CargoArray capacities = GetCapacityOfArticulatedParts(this->engine); CargoArray capacities = GetCapacityOfArticulatedParts(this->engine);
for (CargoID c = 0; c < NUM_CARGO; c++) { for (uint &cap : capacities) {
if (capacities[c] == 0) continue; if (cap != 0) return cap;
return capacities[c];
} }
return -1; return -1;
} }

4
src/vehicle_gui.cpp
View File

@ -1373,8 +1373,8 @@ static bool VehicleCargoSorter(const Vehicle * const &a, const Vehicle * const &
for (v = b; v != nullptr; v = v->Next()) diff[v->cargo_type] -= v->cargo_cap; for (v = b; v != nullptr; v = v->Next()) diff[v->cargo_type] -= v->cargo_cap;
int r = 0; int r = 0;
for (CargoID i = 0; i < NUM_CARGO; i++) { for (uint d : diff) {
r = diff[i]; r = d;
if (r != 0) break; if (r != 0) break;
} }