From 5fce5fa300318db4e87849c2269a0e013d6f89e1 Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Sun, 15 Dec 2019 17:37:35 +0100
Subject: Codechange: Replace FOR_ALL_CARGOPACKETS with range-based for loops

---
 src/saveload/cargopacket_sl.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/saveload/cargopacket_sl.cpp')

diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp
index 90aa33cf9..bb44c663f 100644
--- a/src/saveload/cargopacket_sl.cpp
+++ b/src/saveload/cargopacket_sl.cpp
@@ -58,8 +58,7 @@
 
 	if (IsSavegameVersionBefore(SLV_120)) {
 		/* CargoPacket's source should be either INVALID_STATION or a valid station */
-		CargoPacket *cp;
-		FOR_ALL_CARGOPACKETS(cp) {
+		for (CargoPacket *cp : CargoPacket::Iterate()) {
 			if (!Station::IsValidID(cp->source)) cp->source = INVALID_STATION;
 		}
 	}
@@ -112,9 +111,7 @@ const SaveLoad *GetCargoPacketDesc()
  */
 static void Save_CAPA()
 {
-	CargoPacket *cp;
-
-	FOR_ALL_CARGOPACKETS(cp) {
+	for (CargoPacket *cp : CargoPacket::Iterate()) {
 		SlSetArrayIndex(cp->index);
 		SlObject(cp, GetCargoPacketDesc());
 	}
-- 
cgit v1.2.3-54-g00ecf