diff options
| author | glx <glx@openttd.org> | 2019-12-15 17:54:05 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-21 20:13:03 +0100 |
| commit | fa9769f81a0f96324a7a72f272626c395e002ece (patch) | |
| tree | 77119ee7a1d62cb3e70107ecbf07da1777c4111c /src/saveload/afterload.cpp | |
| parent | 5fce5fa300318db4e87849c2269a0e013d6f89e1 (diff) | |
| download | openttd-fa9769f81a0f96324a7a72f272626c395e002ece.tar.xz | |
Codechange: Replace FOR_ALL_DEPOTS with range-based for loops
Diffstat (limited to 'src/saveload/afterload.cpp')
| -rw-r--r-- | src/saveload/afterload.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index d79cd9410..f979552be 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2330,8 +2330,7 @@ bool AfterLoadGame() } if (IsSavegameVersionBefore(SLV_128)) { - const Depot *d; - FOR_ALL_DEPOTS(d) { + for (const Depot *d : Depot::Iterate()) { /* At some point, invalid depots were saved into the game (possibly those removed in the past?) * Remove them here, so they don't cause issues further down the line */ if (!IsDepotTile(d->xy)) { @@ -2445,15 +2444,13 @@ bool AfterLoadGame() /* We need to properly number/name the depots. * The first step is making sure none of the depots uses the * 'default' names, after that we can assign the names. */ - Depot *d; - FOR_ALL_DEPOTS(d) d->town_cn = UINT16_MAX; + for (Depot *d : Depot::Iterate()) d->town_cn = UINT16_MAX; - FOR_ALL_DEPOTS(d) MakeDefaultName(d); + for (Depot* d : Depot::Iterate()) MakeDefaultName(d); } if (IsSavegameVersionBefore(SLV_142)) { - Depot *d; - FOR_ALL_DEPOTS(d) d->build_date = _date; + for (Depot *d : Depot::Iterate()) d->build_date = _date; } /* In old versions it was possible to remove an airport while a plane was |