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

(svn r16852) -Codechange: use FOR_ALL_CARGOSPECS for iterating over all valid CargoSpecs

Browse Source
This commit is contained in:
smatz
2009-07-16 20:40:06 +00:00
parent 8f4ad741aa
commit cb13cf2543
11 changed files with 100 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_station.cpp
View File

@@ -610,11 +610,11 @@ static const SpriteGroup *ResolveStation(ResolverObject *object)
ctype = CT_PURCHASE;
} else {
/* Pick the first cargo that we have waiting */
for (CargoID cargo = 0; cargo < NUM_CARGO; cargo++) {
const CargoSpec *cs = CargoSpec::Get(cargo);
if (cs->IsValid() && object->u.station.statspec->spritegroup[cargo] != NULL &&
!object->u.station.st->goods[cargo].cargo.Empty()) {
ctype = cargo;
const CargoSpec *cs;
FOR_ALL_CARGOSPECS(cs) {
if (object->u.station.statspec->spritegroup[cs->Index()] != NULL &&
!object->u.station.st->goods[cs->Index()].cargo.Empty()) {
ctype = cs->Index();
break;
}
}