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

Codechange: Replace FOR_ALL_CARGOSPECS with range-based for loops

Browse Source 
(cherry picked from commit 9a8756d7ed)
This commit is contained in:
glx22
2021-04-29 17:51:05 +02:00
committed by Jonathan G Rennison
parent dfe616bef4
commit 050b95e351
8 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_station.cpp
View File

@@ -573,8 +573,7 @@ StationResolverObject::StationResolverObject(const StationSpec *statspec, BaseSt
} else if (Station::IsExpected(this->station_scope.st)) {
const Station *st = Station::From(this->station_scope.st);
/* Pick the first cargo that we have waiting */
const CargoSpec *cs;
FOR_ALL_CARGOSPECS(cs) {
for (const CargoSpec *cs : CargoSpec::Iterate()) {
if (this->station_scope.statspec->grf_prop.spritegroup[cs->Index()] != nullptr &&
st->goods[cs->Index()].cargo.TotalCount() > 0) {
ctype = cs->Index();