cpp/openttd-patchpack/source Changeset - r24299:137b3b26f10a

Changeset - r24299:137b3b26f10a

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

dP - 4 years ago 2020-06-28 16:04:55
dp@dpointer.org

Revert #8157: Redundant change

3 files changed with 11 insertions and 19 deletions:

src/saveload/afterload.cpp

src/saveload/saveload.h

src/saveload/town_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -2830,7 +2830,7 @@ bool AfterLoadGame() @@
 	 * which is done by StartupEngines(). */
 	if (gcf_res != GLC_ALL_GOOD) StartupEngines();
-	if (IsSavegameVersionBefore(SLV_FIX_TOWN_ACCEPTANCE)) {
+	if (IsSavegameVersionBefore(SLV_166)) {
 		/* Update cargo acceptance map of towns. */
 		for (TileIndex t = 0; t < map_size; t++) {
 			if (!IsTileType(t, MP_HOUSE)) continue;

src/saveload/saveload.h

➞

Show inline comments

@@ @@ -302,7 +302,6 @@ 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
 };

src/saveload/town_sl.cpp

➞

Show inline comments

@@ @@ -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_UINT64);
+		SlArray(t->cargo_accepted.data, arr_len, SLE_UINT32);
+	}
+}
@@ @@ -288,23 +288,16 @@ static void Load_TOWN() @@
 			SlErrorCorrupt("Invalid town name generator");
+		}
 		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);
 		if (IsSavegameVersionBefore(SLV_166)) continue;
 				/* 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);
+			}
 		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);
+		}
+	}
+}

0 comments (0 inline, 0 general)