summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/saveload/afterload.cpp9
-rw-r--r--src/saveload/saveload.cpp2
-rw-r--r--src/saveload/saveload_internal.h2
-rw-r--r--src/saveload/waypoint_sl.cpp78
-rw-r--r--src/strings.cpp2
-rw-r--r--src/waypoint.cpp2
-rw-r--r--src/waypoint.h3
-rw-r--r--src/waypoint_cmd.cpp8
8 files changed, 54 insertions, 52 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 66256d12e..a26ef0e6b 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -424,9 +424,6 @@ bool AfterLoadGame()
}
}
- /* Update all waypoints */
- if (CheckSavegameVersion(12)) FixOldWaypoints();
-
if (CheckSavegameVersion(84)) {
FOR_ALL_COMPANIES(c) {
c->name = CopyFromOldName(c->name_1);
@@ -447,12 +444,6 @@ bool AfterLoadGame()
t->name = CopyFromOldName(t->townnametype);
if (t->name != NULL) t->townnametype = SPECSTR_TOWNNAME_START + _settings_game.game_creation.town_name;
}
-
- Waypoint *wp;
- FOR_ALL_WAYPOINTS(wp) {
- wp->name = CopyFromOldName(wp->string_id);
- wp->string_id = STR_NULL;
- }
}
/* From this point the old names array is cleared. */
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 54f2c451f..8b3178512 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -41,7 +41,7 @@
#include "saveload_internal.h"
-extern const uint16 SAVEGAME_VERSION = 121;
+extern const uint16 SAVEGAME_VERSION = 122;
SavegameType _savegame_type; ///< type of savegame we are loading
diff --git a/src/saveload/saveload_internal.h b/src/saveload/saveload_internal.h
index 0486a796f..21030751a 100644
--- a/src/saveload/saveload_internal.h
+++ b/src/saveload/saveload_internal.h
@@ -16,8 +16,6 @@ StringID RemapOldStringID(StringID s);
char *CopyFromOldName(StringID id);
void ResetOldNames();
-void FixOldWaypoints();
-
void AfterLoadWaypoints();
void AfterLoadVehicles(bool part_of_load);
void AfterLoadStations();
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 3298e56a9..f51a09485 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -10,6 +10,7 @@
#include "table/strings.h"
#include "saveload.h"
+#include "saveload_internal.h"
/**
* Update waypoint graphics id against saved GRFID/localidx.
@@ -34,39 +35,25 @@ void AfterLoadWaypoints()
}
}
-/**
- * Fix savegames which stored waypoints in their old format
- */
-void FixOldWaypoints()
-{
- Waypoint *wp;
-
- /* Convert the old 'town_or_string', to 'string' / 'town' / 'town_cn' */
- FOR_ALL_WAYPOINTS(wp) {
- wp->town_index = ClosestTownFromTile(wp->xy, UINT_MAX)->index;
- wp->town_cn = 0;
- if ((wp->string_id & 0xC000) == 0xC000) {
- wp->town_cn = (wp->string_id >> 8) & 0x3F;
- wp->string_id = STR_NULL;
- }
- }
-}
+static uint16 _waypoint_town_index;
+static StringID _waypoint_string_id;
static const SaveLoad _waypoint_desc[] = {
- SLE_CONDVAR(Waypoint, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
- SLE_CONDVAR(Waypoint, xy, SLE_UINT32, 6, SL_MAX_VERSION),
- 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_id, SLE_STRINGID, 0, 83),
- SLE_CONDSTR(Waypoint, name, SLE_STR, 0, 84, SL_MAX_VERSION),
- 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),
- SLE_CONDVAR(Waypoint, spec.localidx, SLE_UINT8, 3, SL_MAX_VERSION),
- SLE_CONDVAR(Waypoint, spec.grfid, SLE_UINT32, 17, SL_MAX_VERSION),
- SLE_CONDVAR(Waypoint, owner, SLE_UINT8, 101, SL_MAX_VERSION),
+ SLE_CONDVAR(Waypoint, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
+ SLE_CONDVAR(Waypoint, xy, SLE_UINT32, 6, SL_MAX_VERSION),
+ SLEG_CONDVAR(_waypoint_town_index, SLE_UINT16, 12, 121),
+ SLE_CONDREF(Waypoint, town, REF_TOWN, 122, 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),
+ SLEG_CONDVAR(_waypoint_string_id, SLE_STRINGID, 0, 83),
+ SLE_CONDSTR(Waypoint, name, SLE_STR, 0, 84, SL_MAX_VERSION),
+ 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),
+ SLE_CONDVAR(Waypoint, spec.localidx, SLE_UINT8, 3, SL_MAX_VERSION),
+ SLE_CONDVAR(Waypoint, spec.grfid, SLE_UINT32, 17, SL_MAX_VERSION),
+ SLE_CONDVAR(Waypoint, owner, SLE_UINT8, 101, SL_MAX_VERSION),
SLE_END()
};
@@ -86,11 +73,38 @@ static void Load_WAYP()
int index;
while ((index = SlIterateArray()) != -1) {
+ _waypoint_string_id = 0;
+ _waypoint_town_index = 0;
+
Waypoint *wp = new (index) Waypoint();
SlObject(wp, _waypoint_desc);
+
+ if (CheckSavegameVersion(84)) wp->name = (char *)(size_t)_waypoint_string_id;
+ if (CheckSavegameVersion(122)) wp->town = (Town *)(size_t)_waypoint_town_index;
+ }
+}
+
+static void Ptrs_WAYP()
+{
+ Waypoint *wp;
+
+ FOR_ALL_WAYPOINTS(wp) {
+ SlObject(wp, _waypoint_desc);
+
+ StringID sid = (StringID)(size_t)wp->name;
+ if (CheckSavegameVersion(12)) {
+ wp->town_cn = (sid & 0xC000) == 0xC000 ? (sid >> 8) & 0x3F : 0;
+ wp->town = ClosestTownFromTile(wp->xy, UINT_MAX);
+ } else if (CheckSavegameVersion(122)) {
+ /* Only for versions 12 .. 122 */
+ wp->town = Town::Get((size_t)wp->town);
+ }
+ if (CheckSavegameVersion(84)) {
+ wp->name = CopyFromOldName(sid);
+ }
}
}
extern const ChunkHandler _waypoint_chunk_handlers[] = {
- { 'CHKP', Save_WAYP, Load_WAYP, NULL, CH_ARRAY | CH_LAST},
+ { 'CHKP', Save_WAYP, Load_WAYP, Ptrs_WAYP, CH_ARRAY | CH_LAST},
};
diff --git a/src/strings.cpp b/src/strings.cpp
index be047b3dd..7b8b06edb 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -861,7 +861,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
buff = strecpy(buff, wp->name, last);
} else {
int64 temp[2];
- temp[0] = wp->town_index;
+ temp[0] = wp->town->index;
temp[1] = wp->town_cn + 1;
StringID str = wp->town_cn == 0 ? STR_WAYPOINTNAME_CITY : STR_WAYPOINTNAME_CITY_SERIAL;
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index d970bb14c..e245627e5 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -57,7 +57,7 @@ Station *ComposeWaypointStation(TileIndex tile)
static Station &stat = *(Station*)stat_raw;
stat.train_tile = stat.xy = wp->xy;
- stat.town = Town::Get(wp->town_index);
+ stat.town = wp->town;
stat.build_date = wp->build_date;
return &stat;
diff --git a/src/waypoint.h b/src/waypoint.h
index 3111f7a92..18fc2a33c 100644
--- a/src/waypoint.h
+++ b/src/waypoint.h
@@ -20,9 +20,8 @@ extern WaypointPool _waypoint_pool;
struct Waypoint : WaypointPool::PoolItem<&_waypoint_pool> {
TileIndex xy; ///< Tile of waypoint
- TownID town_index; ///< Town associated with the waypoint
+ Town *town; ///< Town associated with the waypoint
uint16 town_cn; ///< The Nth waypoint for this town (consecutive number)
- StringID string_id;///< C000-C03F have special meaning in old games
char *name; ///< Custom name. If not set, town + town_cn is used for naming
ViewportSign sign; ///< Dimensions of sign (not saved)
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 6bf080912..cddd4a7ac 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -45,7 +45,7 @@ static void MakeDefaultWaypointName(Waypoint *wp)
uint32 next = 0; // first waypoint number in the bitmap
WaypointID idx = 0; // index where we will stop
- wp->town_index = ClosestTownFromTile(wp->xy, UINT_MAX)->index;
+ wp->town = ClosestTownFromTile(wp->xy, UINT_MAX);
/* Find first unused waypoint number belonging to this town. This can never fail,
* as long as there can be at most 65535 waypoints in total.
@@ -64,7 +64,7 @@ static void MakeDefaultWaypointName(Waypoint *wp)
/* check only valid waypoints... */
if (lwp != NULL && wp != lwp) {
/* only waypoints with 'generic' name within the same city */
- if (lwp->name == NULL && lwp->town_index == wp->town_index) {
+ if (lwp->name == NULL && lwp->town == wp->town) {
/* if lwp->town_cn < next, uint will overflow to '+inf' */
uint i = (uint)lwp->town_cn - next;
@@ -164,7 +164,7 @@ CommandCost CmdBuildTrainWaypoint(TileIndex tile, DoCommandFlag flags, uint32 p1
if (wp == NULL) {
wp = new Waypoint(tile);
- wp->town_index = INVALID_TOWN;
+ wp->town = NULL;
wp->name = NULL;
wp->town_cn = 0;
} else {
@@ -206,7 +206,7 @@ CommandCost CmdBuildTrainWaypoint(TileIndex tile, DoCommandFlag flags, uint32 p1
wp->delete_ctr = 0;
wp->build_date = _date;
- if (wp->town_index == INVALID_TOWN) MakeDefaultWaypointName(wp);
+ if (wp->town == NULL) MakeDefaultWaypointName(wp);
wp->UpdateVirtCoord();
YapfNotifyTrackLayoutChange(tile, AxisToTrack(axis));
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-07-08 03:30:23 +0000