diff options
author | glx <glx@openttd.org> | 2019-12-17 21:22:15 +0100 |
---|---|---|
committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-21 20:13:03 +0100 |
commit | 0b489f99249a8c62ee3826e490ed17f29377581c (patch) | |
tree | c5289a92bbb98d40d38e3320276e6e02f732f633 /src/saveload | |
parent | 847e5f33d4749568cda696b8940ec10b540bd6fb (diff) | |
download | openttd-0b489f99249a8c62ee3826e490ed17f29377581c.tar.xz |
Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops
Diffstat (limited to 'src/saveload')
-rw-r--r-- | src/saveload/afterload.cpp | 3 | ||||
-rw-r--r-- | src/saveload/subsidy_sl.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index f4e81b75b..519e4d46e 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2219,8 +2219,7 @@ bool AfterLoadGame() if (IsSavegameVersionBefore(SLV_125)) { /* Convert old subsidies */ - Subsidy *s; - FOR_ALL_SUBSIDIES(s) { + for (Subsidy *s : Subsidy::Iterate()) { if (s->remaining < 12) { /* Converting nonawarded subsidy */ s->remaining = 12 - s->remaining; // convert "age" to "remaining" diff --git a/src/saveload/subsidy_sl.cpp b/src/saveload/subsidy_sl.cpp index 2ee3b4f95..d0db78b61 100644 --- a/src/saveload/subsidy_sl.cpp +++ b/src/saveload/subsidy_sl.cpp @@ -29,8 +29,7 @@ static const SaveLoad _subsidies_desc[] = { static void Save_SUBS() { - Subsidy *s; - FOR_ALL_SUBSIDIES(s) { + for (Subsidy *s : Subsidy::Iterate()) { SlSetArrayIndex(s->index); SlObject(s, _subsidies_desc); } |