summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/saveload/afterload.cpp2
-rw-r--r--src/saveload/saveload.h1
-rw-r--r--src/saveload/town_sl.cpp27
3 files changed, 19 insertions, 11 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index cc2a671a2..e9c1cdb90 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -2830,7 +2830,7 @@ bool AfterLoadGame()
* which is done by StartupEngines(). */
if (gcf_res != GLC_ALL_GOOD) StartupEngines();
- if (IsSavegameVersionBefore(SLV_166)) {
+ if (IsSavegameVersionBefore(SLV_FIX_TOWN_ACCEPTANCE)) {
/* Update cargo acceptance map of towns. */
for (TileIndex t = 0; t < map_size; t++) {
if (!IsTileType(t, MP_HOUSE)) continue;
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index 26462cdaa..dcf8a41d8 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -302,6 +302,7 @@ enum SaveLoadVersion : uint16 {
SLV_MULTITILE_DOCKS, ///< 216 PR#7380 Multiple docks per station.
SLV_TRADING_AGE, ///< 217 PR#7780 Configurable company trading age.
SLV_ENDING_YEAR, ///< 218 PR#7747 v1.10 Configurable ending year.
+ SLV_FIX_TOWN_ACCEPTANCE, ///< 219 PR#8157 Fix Town::cargo_accepted savegame format.
SL_MAX_VERSION, ///< Highest possible saveload version
};
diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index cbf7205d0..7e41ef6cc 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -256,7 +256,7 @@ static void RealSave_Town(Town *t)
SlObject(&t->cargo_accepted, GetTileMatrixDesc());
if (t->cargo_accepted.area.w != 0) {
uint arr_len = t->cargo_accepted.area.w / AcceptanceMatrix::GRID * t->cargo_accepted.area.h / AcceptanceMatrix::GRID;
- SlArray(t->cargo_accepted.data, arr_len, SLE_UINT32);
+ SlArray(t->cargo_accepted.data, arr_len, SLE_UINT64);
}
}
@@ -288,16 +288,23 @@ static void Load_TOWN()
SlErrorCorrupt("Invalid town name generator");
}
- if (IsSavegameVersionBefore(SLV_166)) continue;
+ if (!IsSavegameVersionBefore(SLV_FIX_TOWN_ACCEPTANCE)) {
+ SlObject(&t->cargo_accepted, GetTileMatrixDesc());
+ if (t->cargo_accepted.area.w != 0) {
+ uint arr_len = t->cargo_accepted.area.w / AcceptanceMatrix::GRID * t->cargo_accepted.area.h / AcceptanceMatrix::GRID;
+ t->cargo_accepted.data = MallocT<CargoTypes>(arr_len);
+ SlArray(t->cargo_accepted.data, arr_len, SLE_UINT64);
- SlObject(&t->cargo_accepted, GetTileMatrixDesc());
- if (t->cargo_accepted.area.w != 0) {
- uint arr_len = t->cargo_accepted.area.w / AcceptanceMatrix::GRID * t->cargo_accepted.area.h / AcceptanceMatrix::GRID;
- t->cargo_accepted.data = MallocT<CargoTypes>(arr_len);
- SlArray(t->cargo_accepted.data, arr_len, SLE_UINT32);
-
- /* Rebuild total cargo acceptance. */
- UpdateTownCargoTotal(t);
+ /* Rebuild total cargo acceptance. */
+ UpdateTownCargoTotal(t);
+ }
+ } else if (!IsSavegameVersionBefore(SLV_166)) {
+ AcceptanceMatrix cargo_accepted;
+ SlObject(&cargo_accepted, GetTileMatrixDesc());
+ if (cargo_accepted.area.w != 0) {
+ uint arr_len = cargo_accepted.area.w / AcceptanceMatrix::GRID * cargo_accepted.area.h / AcceptanceMatrix::GRID;
+ SlSkipBytes(4 * arr_len);
+ }
}
}
}