cpp/openttd-patchpack/source Changeset - r27893:8c85dc228529

Changeset - r27893:8c85dc228529

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Patric Stout - 9 months ago 2023-09-10 20:35:03
truebrain@openttd.org

Fix b0e73277: save/load next_station for CargoPacket again

2 files changed with 3 insertions and 1 deletions:

src/saveload/cargopacket_sl.cpp

src/saveload/compat/cargopacket_sl_compat.h

0 comments (0 inline, 0 general)

src/saveload/cargopacket_sl.cpp

➞

Show inline comments

@@ @@ -85,12 +85,14 @@ @@
  */
 SaveLoadTable GetCargoPacketDesc()
+{
 	static const SaveLoad _cargopacket_desc[] = {
 		SLE_VARNAME(CargoPacket, first_station, "source", SLE_UINT16),
 		SLE_VAR(CargoPacket, source_xy,       SLE_UINT32),
 		SLE_CONDVARNAME(CargoPacket, next_hop, "loaded_at_xy", SLE_FILE_U32 | SLE_VAR_U16, SL_MIN_VERSION, SLV_REMOVE_LOADED_AT_XY),
 		SLE_CONDVARNAME(CargoPacket, next_hop, "loaded_at_xy", SLE_UINT16, SLV_REMOVE_LOADED_AT_XY, SL_MAX_VERSION),
 		SLE_VAR(CargoPacket, count,           SLE_UINT16),
 		SLE_CONDVARNAME(CargoPacket, periods_in_transit, "days_in_transit", SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_MORE_CARGO_AGE),
 		SLE_CONDVARNAME(CargoPacket, periods_in_transit, "days_in_transit", SLE_UINT16, SLV_MORE_CARGO_AGE, SLV_PERIODS_IN_TRANSIT_RENAME),
 		SLE_CONDVAR(CargoPacket, periods_in_transit, SLE_UINT16, SLV_PERIODS_IN_TRANSIT_RENAME, SL_MAX_VERSION),
 		SLE_VAR(CargoPacket, feeder_share,    SLE_INT64),
 		SLE_CONDVAR(CargoPacket, source_type,     SLE_UINT8,  SLV_125, SL_MAX_VERSION),

src/saveload/compat/cargopacket_sl_compat.h

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
 #include "../saveload.h"
 /** Original field order for _cargopacket_desc. */
 const SaveLoadCompat _cargopacket_sl_compat[] = {
 	SLC_VAR("source"),
 	SLC_VAR("source_xy"),
-	SLC_NULL(4, SL_MIN_VERSION, SLV_REMOVE_LOADED_AT_XY),
+	SLC_VAR("loaded_at_xy"),
 	SLC_VAR("count"),
 	SLC_VAR("days_in_transit"),
 	SLC_VAR("feeder_share"),
 	SLC_VAR("source_type"),
 	SLC_VAR("source_id"),
 	SLC_NULL(1, SL_MIN_VERSION, SLV_121),

0 comments (0 inline, 0 general)