(svn r16711) -Codechange: use FOR_ALL_SUBSIDIES macro when iterating over all subsidies

2 files changed, 5 insertions, 10 deletions

diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 809248faf..28c5cd525 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -1916,8 +1916,8 @@ bool AfterLoadGame()
 		}
 
 		/* Delete invalid subsidies possibly present in old versions (but converted to new savegame) */
-		for (Subsidy *s = _subsidies; s < endof(_subsidies); s++) {
-			if (s->cargo_type == CT_INVALID) continue;
+		Subsidy *s;
+		FOR_ALL_SUBSIDIES(s) {
 			if (s->age >= 12) {
 				/* Station -> Station */
 				const Station *from = Station::GetIfValid(s->from);
diff --git a/src/saveload/subsidy_sl.cpp b/src/saveload/subsidy_sl.cpp
index 7ff23e6f8..7e59a80e3 100644
--- a/src/saveload/subsidy_sl.cpp
+++ b/src/saveload/subsidy_sl.cpp
@@ -19,15 +19,10 @@ static const SaveLoad _subsidies_desc[] = {
 
 void Save_SUBS()
 {
-	int i;
 	Subsidy *s;
-
-	for (i = 0; i != lengthof(_subsidies); i++) {
-		s = &_subsidies[i];
-		if (s->cargo_type != CT_INVALID) {
-			SlSetArrayIndex(i);
-			SlObject(s, _subsidies_desc);
-		}
+	FOR_ALL_SUBSIDIES(s) {
+		SlSetArrayIndex(s - _subsidies);
+		SlObject(s, _subsidies_desc);
 	}
 }