diff options
| author | glx <glx@openttd.org> | 2019-12-15 05:55:59 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-21 20:13:03 +0100 |
| commit | ddabfed1cd3efa9ee229214207a60fc7cb3e0641 (patch) | |
| tree | 824eddd3155d04363864731a43a6863cd7fbd2a3 /src/station_gui.cpp | |
| parent | 3a14cea068d130e11b5d9dde11d4451dd7dec453 (diff) | |
| download | openttd-ddabfed1cd3efa9ee229214207a60fc7cb3e0641.tar.xz | |
Codechange: Replace station related FOR_ALL with range-based for loops
Diffstat (limited to 'src/station_gui.cpp')
| -rw-r--r-- | src/station_gui.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 17b884e50..a4804528c 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -229,8 +229,7 @@ protected: this->stations.clear(); - const Station *st; - FOR_ALL_STATIONS(st) { + for (const Station *st : Station::Iterate()) { if (st->owner == owner || (st->owner == OWNER_NONE && HasStationInUse(st->index, true, owner))) { if (this->facilities & st->facilities) { // only stations with selected facilities int num_waiting_cargo = 0; @@ -2242,8 +2241,7 @@ static const T *FindStationsNearby(TileArea ta, bool distant_join) } /* Look for deleted stations */ - const BaseStation *st; - FOR_ALL_BASE_STATIONS(st) { + for (const BaseStation *st : BaseStation::Iterate()) { if (T::IsExpected(st) && !st->IsInUse() && st->owner == _local_company) { /* Include only within station spread (yes, it is strictly less than) */ if (max(DistanceMax(ta.tile, st->xy), DistanceMax(TILE_ADDXY(ta.tile, ta.w - 1, ta.h - 1), st->xy)) < _settings_game.station.station_spread) { |