summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2018-09-20 23:44:14 +0100
committerPeterN <peter@fuzzle.org>2019-03-26 20:15:57 +0000
commitbfd79e59dc34314a089a0024af56d04d84456ebd (patch)
treed03559bac7a8c3f1d260cead2ed77791c03d37a5 /src/saveload
parent4b349c0f90c3f7b6a39171cec41cd98dcd0d88b7 (diff)
downloadopenttd-bfd79e59dc34314a089a0024af56d04d84456ebd.tar.xz
Codechange: Replace SmallVector::Clear() with std::vector::clear()
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/afterload.cpp2
-rw-r--r--src/saveload/animated_tile_sl.cpp2
-rw-r--r--src/saveload/engine_sl.cpp2
-rw-r--r--src/saveload/labelmaps_sl.cpp4
-rw-r--r--src/saveload/waypoint_sl.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 6ec4ab67c..851eb6a78 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -2942,7 +2942,7 @@ bool AfterLoadGame()
SmallVector<uint, 16> skip_frames;
FOR_ALL_ROADVEHICLES(v) {
if (!v->IsFrontEngine()) continue;
- skip_frames.Clear();
+ skip_frames.clear();
TileIndex prev_tile = v->tile;
uint prev_tile_skip = 0;
uint cur_skip = 0;
diff --git a/src/saveload/animated_tile_sl.cpp b/src/saveload/animated_tile_sl.cpp
index c54c4724a..6db0561cd 100644
--- a/src/saveload/animated_tile_sl.cpp
+++ b/src/saveload/animated_tile_sl.cpp
@@ -48,7 +48,7 @@ static void Load_ANIT()
}
uint count = (uint)SlGetFieldLength() / sizeof(*_animated_tiles.Begin());
- _animated_tiles.Clear();
+ _animated_tiles.clear();
_animated_tiles.Append(count);
SlArray(_animated_tiles.Begin(), count, SLE_UINT32);
}
diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp
index 5221d1bbd..87b18336c 100644
--- a/src/saveload/engine_sl.cpp
+++ b/src/saveload/engine_sl.cpp
@@ -187,7 +187,7 @@ static void Save_EIDS()
static void Load_EIDS()
{
- _engine_mngr.Clear();
+ _engine_mngr.clear();
while (SlIterateArray() != -1) {
EngineIDMapping *eid = _engine_mngr.Append();
diff --git a/src/saveload/labelmaps_sl.cpp b/src/saveload/labelmaps_sl.cpp
index 3b898a3b8..b57a89f20 100644
--- a/src/saveload/labelmaps_sl.cpp
+++ b/src/saveload/labelmaps_sl.cpp
@@ -81,7 +81,7 @@ void AfterLoadLabelMaps()
}
}
- _railtype_list.Clear();
+ _railtype_list.clear();
}
/** Container for a label for SaveLoad system */
@@ -108,7 +108,7 @@ static void Save_RAIL()
static void Load_RAIL()
{
- _railtype_list.Clear();
+ _railtype_list.clear();
LabelObject lo;
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index ae74d812b..2567c2c93 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -172,7 +172,7 @@ static const SaveLoad _old_waypoint_desc[] = {
static void Load_WAYP()
{
/* Precaution for when loading failed and it didn't get cleared */
- _old_waypoints.Clear();
+ _old_waypoints.clear();
int index;
@@ -201,7 +201,7 @@ static void Ptrs_WAYP()
* whether we're in the NULL or "normal" Ptrs proc. So just clear the list
* of old waypoints we constructed and then this waypoint (and the other
* possibly corrupt ones) will not be queried in the NULL Ptrs proc run. */
- _old_waypoints.Clear();
+ _old_waypoints.clear();
SlErrorCorrupt("Referencing invalid Town");
}
wp->town = Town::Get(wp->town_index);