summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2019-12-15 17:37:35 +0100
committerNiels Martin Hansen <nielsm@indvikleren.dk>2019-12-21 20:13:03 +0100
commit5fce5fa300318db4e87849c2269a0e013d6f89e1 (patch)
treee2c5128a259e6e7ce70144cb7cb86929d4d35f05 /src/saveload
parent60e3cf8aff9a7b98a0365ab734bebf70607160a1 (diff)
downloadopenttd-5fce5fa300318db4e87849c2269a0e013d6f89e1.tar.xz
Codechange: Replace FOR_ALL_CARGOPACKETS with range-based for loops
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/cargopacket_sl.cpp7
1 files changed, 2 insertions, 5 deletions
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());
}