summaryrefslogtreecommitdiff
path: root/src/cargopacket.cpp
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/cargopacket.cpp
parent60e3cf8aff9a7b98a0365ab734bebf70607160a1 (diff)
downloadopenttd-5fce5fa300318db4e87849c2269a0e013d6f89e1.tar.xz
Codechange: Replace FOR_ALL_CARGOPACKETS with range-based for loops
Diffstat (limited to 'src/cargopacket.cpp')
-rw-r--r--src/cargopacket.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index e1af2bc8f..f5f7c0c03 100644
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -126,8 +126,7 @@ void CargoPacket::Reduce(uint count)
*/
/* static */ void CargoPacket::InvalidateAllFrom(SourceType src_type, SourceID src)
{
- CargoPacket *cp;
- FOR_ALL_CARGOPACKETS(cp) {
+ for (CargoPacket *cp : CargoPacket::Iterate()) {
if (cp->source_type == src_type && cp->source_id == src) cp->source_id = INVALID_SOURCE;
}
}
@@ -138,8 +137,7 @@ void CargoPacket::Reduce(uint count)
*/
/* static */ void CargoPacket::InvalidateAllFrom(StationID sid)
{
- CargoPacket *cp;
- FOR_ALL_CARGOPACKETS(cp) {
+ for (CargoPacket *cp : CargoPacket::Iterate()) {
if (cp->source == sid) cp->source = INVALID_STATION;
}
}