summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2019-12-17 19:11:24 +0100
committerNiels Martin Hansen <nielsm@indvikleren.dk>2019-12-21 20:13:03 +0100
commitb91abd3af98cca51221210198e2c9607055c19b2 (patch)
tree5a19db5c977db576ba89d67873d59f3e10a4f00f /src/saveload
parent514565fad6d3a7e93a24b53b29eb901ef4f6a166 (diff)
downloadopenttd-b91abd3af98cca51221210198e2c9607055c19b2.tar.xz
Codechange: Replace FOR_ALL_ROADSTOPS with range-based for loops
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/station_sl.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp
index 2df8d8167..1d3612ae3 100644
--- a/src/saveload/station_sl.cpp
+++ b/src/saveload/station_sl.cpp
@@ -129,12 +129,11 @@ void AfterLoadStations()
void AfterLoadRoadStops()
{
/* First construct the drive through entries */
- RoadStop *rs;
- FOR_ALL_ROADSTOPS(rs) {
+ for (RoadStop *rs : RoadStop::Iterate()) {
if (IsDriveThroughStopTile(rs->xy)) rs->MakeDriveThrough();
}
/* And then rebuild the data in those entries */
- FOR_ALL_ROADSTOPS(rs) {
+ for (RoadStop *rs : RoadStop::Iterate()) {
if (!HasBit(rs->status, RoadStop::RSSFB_BASE_ENTRY)) continue;
rs->GetEntry(DIAGDIR_NE)->Rebuild(rs);
@@ -606,9 +605,7 @@ static void Ptrs_STNN()
static void Save_ROADSTOP()
{
- RoadStop *rs;
-
- FOR_ALL_ROADSTOPS(rs) {
+ for (RoadStop *rs : RoadStop::Iterate()) {
SlSetArrayIndex(rs->index);
SlObject(rs, _roadstop_desc);
}
@@ -627,8 +624,7 @@ static void Load_ROADSTOP()
static void Ptrs_ROADSTOP()
{
- RoadStop *rs;
- FOR_ALL_ROADSTOPS(rs) {
+ for (RoadStop *rs : RoadStop::Iterate()) {
SlObject(rs, _roadstop_desc);
}
}