summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2020-12-15 00:22:04 +0100
committerMichael Lutz <michi@icosahedron.de>2020-12-15 00:29:30 +0100
commit79240eab1ee4abb2882a40c7ac18e4915b4dc820 (patch)
tree98abb3c8ccf490efa459ed29fe7f28699c8d9928 /src/saveload
parentcc1679e3171bf6982164c4072a773fdd687ea885 (diff)
downloadopenttd-79240eab1ee4abb2882a40c7ac18e4915b4dc820.tar.xz
Codechange: Make use of the improved C++17 emplace_back function.
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/afterload.cpp3
-rw-r--r--src/saveload/engine_sl.cpp3
-rw-r--r--src/saveload/waypoint_sl.cpp3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 163ded73c..7d1e70212 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -2924,8 +2924,7 @@ bool AfterLoadGame()
cur_skip = prev_tile_skip;
}
- /*C++17: uint &this_skip = */ skip_frames.push_back(prev_tile_skip);
- uint &this_skip = skip_frames.back();
+ uint &this_skip = skip_frames.emplace_back(prev_tile_skip);
/* The following 3 curves now take longer than before */
switch (u->state) {
diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp
index 863aabff0..b0b9d02d4 100644
--- a/src/saveload/engine_sl.cpp
+++ b/src/saveload/engine_sl.cpp
@@ -191,8 +191,7 @@ static void Load_EIDS()
_engine_mngr.clear();
while (SlIterateArray() != -1) {
- /*C++17: EngineIDMapping *eid = &*/ _engine_mngr.emplace_back();
- EngineIDMapping *eid = &_engine_mngr.back();
+ EngineIDMapping *eid = &_engine_mngr.emplace_back();
SlObject(eid, _engine_id_mapping_desc);
}
}
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 4117a591e..663c61f6a 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -192,8 +192,7 @@ static void Load_WAYP()
int index;
while ((index = SlIterateArray()) != -1) {
- /*C++17: OldWaypoint *wp = &*/ _old_waypoints.emplace_back();
- OldWaypoint *wp = &_old_waypoints.back();
+ OldWaypoint *wp = &_old_waypoints.emplace_back();
wp->index = index;
SlObject(wp, _old_waypoint_desc);