From 77d13eae6194387ca6ce2b0eb835b7f97f67d085 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Thu, 16 Jul 2009 20:40:06 +0000
Subject: (svn r16852) -Codechange: use FOR_ALL_CARGOSPECS for iterating over
 all valid CargoSpecs

---
 src/ai/api/ai_cargo.cpp     | 2 +-
 src/ai/api/ai_cargolist.cpp | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/ai')

diff --git a/src/ai/api/ai_cargo.cpp b/src/ai/api/ai_cargo.cpp
index 4b1593d26..cf9868e2f 100644
--- a/src/ai/api/ai_cargo.cpp
+++ b/src/ai/api/ai_cargo.cpp
@@ -46,7 +46,7 @@
 {
 	if (!IsValidCargo(cargo_type)) return TE_NONE;
 
-	return (AICargo::TownEffect)CargoSpec::Get(cargo_type)->town_effect;
+	return (AICargo::TownEffect)::CargoSpec::Get(cargo_type)->town_effect;
 }
 
 /* static */ Money AICargo::GetCargoIncome(CargoID cargo_type, uint32 distance, uint32 days_in_transit)
diff --git a/src/ai/api/ai_cargolist.cpp b/src/ai/api/ai_cargolist.cpp
index ebf664dee..b5b04c3ea 100644
--- a/src/ai/api/ai_cargolist.cpp
+++ b/src/ai/api/ai_cargolist.cpp
@@ -10,11 +10,9 @@
 
 AICargoList::AICargoList()
 {
-	for (byte i = 0; i < NUM_CARGO; i++) {
-		const CargoSpec *c = ::CargoSpec::Get(i);
-		if (c->IsValid()) {
-			this->AddItem(i);
-		}
+	const CargoSpec *cs;
+	FOR_ALL_CARGOSPECS(cs) {
+		this->AddItem(cs->Index());
 	}
 }
 
-- 
cgit v1.2.3-54-g00ecf