From 77d13eae6194387ca6ce2b0eb835b7f97f67d085 Mon Sep 17 00:00:00 2001 From: smatz Date: Thu, 16 Jul 2009 20:40:06 +0000 Subject: (svn r16852) -Codechange: use FOR_ALL_CARGOSPECS for iterating over all valid CargoSpecs --- src/build_vehicle_gui.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/build_vehicle_gui.cpp') diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 07443475b..bad9aa049 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -820,11 +820,10 @@ struct BuildVehicleWindow : Window { } /* Collect available cargo types for filtering */ - for (CargoID cid = 0; cid < NUM_CARGO; cid++) { - const CargoSpec *cargo = CargoSpec::Get(cid); - if (!cargo->IsValid()) continue; - if (IsCargoInClass(cid, CC_SPECIAL)) continue; // exclude fake cargo types - this->cargo_filter[filter_items] = cid; + const CargoSpec *cargo; + FOR_ALL_CARGOSPECS(cargo) { + if (IsCargoInClass(cargo->Index(), CC_SPECIAL)) continue; // exclude fake cargo types + this->cargo_filter[filter_items] = cargo->Index(); this->cargo_filter_texts[filter_items] = cargo->name; filter_items++; } -- cgit v1.2.3-54-g00ecf