mirror of https://github.com/OpenTTD/OpenTTD.git
Codechange: Use range-for to simplify getting first non-zero value.
This reduces indexed array access.
This commit is contained in:
parent
4181d3c1ff
commit
3f853d8003
|
@ -94,9 +94,8 @@
|
|||
case VEH_ROAD:
|
||||
case VEH_TRAIN: {
|
||||
CargoArray capacities = GetCapacityOfArticulatedParts(engine_id);
|
||||
for (CargoID c = 0; c < NUM_CARGO; c++) {
|
||||
if (capacities[c] == 0) continue;
|
||||
return capacities[c];
|
||||
for (uint &cap : capacities) {
|
||||
if (cap != 0) return cap;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -62,9 +62,8 @@ int32_t ScriptEventEnginePreview::GetCapacity()
|
|||
case VEH_ROAD:
|
||||
case VEH_TRAIN: {
|
||||
CargoArray capacities = GetCapacityOfArticulatedParts(this->engine);
|
||||
for (CargoID c = 0; c < NUM_CARGO; c++) {
|
||||
if (capacities[c] == 0) continue;
|
||||
return capacities[c];
|
||||
for (uint &cap : capacities) {
|
||||
if (cap != 0) return cap;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
int r = 0;
|
||||
for (CargoID i = 0; i < NUM_CARGO; i++) {
|
||||
r = diff[i];
|
||||
for (uint d : diff) {
|
||||
r = d;
|
||||
if (r != 0) break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue