diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:31:59 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | 63ccb36ef3ecd53a503c0e9fea87f0784802af0f (patch) | |
| tree | d3e1134029fd437d1ad2d948f83592b930e9456f /src/saveload/waypoint_sl.cpp | |
| parent | 9b6f5e3bb850b6cff02cc761767fcdf49c681645 (diff) | |
| download | openttd-63ccb36ef3ecd53a503c0e9fea87f0784802af0f.tar.xz | |
Codechange: Use std::string for most of the user-settable custom names.
Diffstat (limited to 'src/saveload/waypoint_sl.cpp')
| -rw-r--r-- | src/saveload/waypoint_sl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp index 5336d247b..4117a591e 100644 --- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -29,7 +29,7 @@ struct OldWaypoint { Town *town; uint16 town_cn; StringID string_id; - char *name; + std::string name; uint8 delete_ctr; Date build_date; uint8 localidx; @@ -172,7 +172,7 @@ static const SaveLoad _old_waypoint_desc[] = { SLE_CONDVAR(OldWaypoint, town_cn, SLE_FILE_U8 | SLE_VAR_U16, SLV_12, SLV_89), SLE_CONDVAR(OldWaypoint, town_cn, SLE_UINT16, SLV_89, SL_MAX_VERSION), SLE_CONDVAR(OldWaypoint, string_id, SLE_STRINGID, SL_MIN_VERSION, SLV_84), - SLE_CONDSTR(OldWaypoint, name, SLE_STR, 0, SLV_84, SL_MAX_VERSION), + SLE_CONDSSTR(OldWaypoint, name, SLE_STR, SLV_84, SL_MAX_VERSION), SLE_VAR(OldWaypoint, delete_ctr, SLE_UINT8), SLE_CONDVAR(OldWaypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, SLV_3, SLV_31), @@ -194,7 +194,6 @@ static void Load_WAYP() while ((index = SlIterateArray()) != -1) { /*C++17: OldWaypoint *wp = &*/ _old_waypoints.emplace_back(); OldWaypoint *wp = &_old_waypoints.back(); - memset(wp, 0, sizeof(*wp)); wp->index = index; SlObject(wp, _old_waypoint_desc); |