summaryrefslogtreecommitdiff
path: root/src/station.cpp
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2019-12-17 03:37:43 +0100
committerNiels Martin Hansen <nielsm@indvikleren.dk>2019-12-21 20:13:03 +0100
commitd8a1be48cd60c690235de175e9a044b95f92ea28 (patch)
tree2e1481aa11661c28df49f0d62f56fbf730577152 /src/station.cpp
parent9892d90b26db4dfe97ec7baeb89e43acb53a178e (diff)
downloadopenttd-d8a1be48cd60c690235de175e9a044b95f92ea28.tar.xz
Codechange: Replace vehicle related FOR_ALL with range-based for loops
Diffstat (limited to 'src/station.cpp')
-rw-r--r--src/station.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/station.cpp b/src/station.cpp
index 01311ece3..3e00bdb14 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -97,8 +97,7 @@ Station::~Station()
this->loading_vehicles.front()->LeaveStation();
}
- Aircraft *a;
- FOR_ALL_AIRCRAFT(a) {
+ for (Aircraft *a : Aircraft::Iterate()) {
if (!a->IsNormalAircraft()) continue;
if (a->targetairport == this->index) a->targetairport = INVALID_STATION;
}
@@ -122,8 +121,7 @@ Station::~Station()
}
}
- Vehicle *v;
- FOR_ALL_VEHICLES(v) {
+ for (Vehicle *v : Vehicle::Iterate()) {
/* Forget about this station if this station is removed */
if (v->last_station_visited == this->index) {
v->last_station_visited = INVALID_STATION;