diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-16 20:15:28 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-16 20:15:28 +0000 |
| commit | dea1144bcb52b6c5f2c985395b2775cedcbff5ce (patch) | |
| tree | 3cebb6aa3ae76df53289dc9feae68b253ea6a101 /src/saveload | |
| parent | 1f29e38b8372484d51d852b89fc957eb53635ecb (diff) | |
| download | openttd-dea1144bcb52b6c5f2c985395b2775cedcbff5ce.tar.xz | |
(svn r16850) -Codechange: unify some naming of variables between waypoints and stations.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 6 | ||||
| -rw-r--r-- | src/saveload/waypoint_sl.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 3d5af563c..9d1537a7d 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -447,8 +447,8 @@ bool AfterLoadGame() Waypoint *wp; FOR_ALL_WAYPOINTS(wp) { - wp->name = CopyFromOldName(wp->string); - wp->string = STR_EMPTY; + wp->name = CopyFromOldName(wp->string_id); + wp->string_id = STR_NULL; } } @@ -1005,7 +1005,7 @@ bool AfterLoadGame() Waypoint *wp; FOR_ALL_WAYPOINTS(wp) { - if (wp->deleted == 0) { + if (wp->delete_ctr == 0) { const StationSpec *statspec = NULL; if (HasBit(_m[wp->xy].m3, 4)) diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp index 48c1c92f1..46a2ddb2a 100644 --- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -45,9 +45,9 @@ void FixOldWaypoints() FOR_ALL_WAYPOINTS(wp) { wp->town_index = ClosestTownFromTile(wp->xy, UINT_MAX)->index; wp->town_cn = 0; - if (wp->string & 0xC000) { - wp->town_cn = wp->string & 0x3F; - wp->string = STR_NULL; + if (wp->string_id & 0xC000) { + wp->town_cn = wp->string_id & 0x3F; + wp->string_id = STR_NULL; } } } @@ -58,9 +58,9 @@ static const SaveLoad _waypoint_desc[] = { SLE_CONDVAR(Waypoint, town_index, SLE_UINT16, 12, SL_MAX_VERSION), SLE_CONDVAR(Waypoint, town_cn, SLE_FILE_U8 | SLE_VAR_U16, 12, 88), SLE_CONDVAR(Waypoint, town_cn, SLE_UINT16, 89, SL_MAX_VERSION), - SLE_CONDVAR(Waypoint, string, SLE_STRINGID, 0, 83), + SLE_CONDVAR(Waypoint, string_id, SLE_STRINGID, 0, 83), SLE_CONDSTR(Waypoint, name, SLE_STR, 0, 84, SL_MAX_VERSION), - SLE_VAR(Waypoint, deleted, SLE_UINT8), + SLE_VAR(Waypoint, delete_ctr, SLE_UINT8), SLE_CONDVAR(Waypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32, 3, 30), SLE_CONDVAR(Waypoint, build_date, SLE_INT32, 31, SL_MAX_VERSION), |