Saveload: Add support for upstream savegame version 316

11 months ago · 2ed98b3b9d
parent f4d237e022
commit 2ed98b3b9d
2 changed files with 3 additions and 1 deletions
--- a/src/saveload/cargopacket_sl.cpp
+++ b/src/saveload/cargopacket_sl.cpp
@ -32,7 +32,8 @@ SaveLoadTable GetCargoPacketDesc()
 		SLE_VAR(CargoPacket, loaded_at_xy,    SLE_UINT32),
 		SLE_VAR(CargoPacket, count,           SLE_UINT16),
 		SLE_CONDVAR(CargoPacket, days_in_transit, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SLV_MORE_CARGO_AGE),
-		SLE_CONDVAR(CargoPacket, days_in_transit, SLE_UINT16, SLV_MORE_CARGO_AGE, SL_MAX_VERSION),
+		SLE_CONDVAR(CargoPacket, days_in_transit, SLE_UINT16, SLV_MORE_CARGO_AGE, SLV_PERIODS_IN_TRANSIT_RENAME),
+		SLE_CONDVARNAME(CargoPacket, days_in_transit, "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),
 		SLE_CONDVAR(CargoPacket, source_id,       SLE_UINT16, SLV_125, SL_MAX_VERSION),
--- a/src/sl/saveload_common.h
+++ b/src/sl/saveload_common.h
@ -369,6 +369,7 @@ enum SaveLoadVersion : uint16 {
 	SLV_STRING_GAMELOG,                     ///< 314  PR#10801 Use std::string in gamelog.

 	SLV_INDUSTRY_CARGO_REORGANISE,          ///< 315  PR#10853 Industry accepts/produced data reorganised.
+	SLV_PERIODS_IN_TRANSIT_RENAME,          ///< 316  PR#11112 Rename days in transit to (cargo) periods in transit.

 	SL_MAX_VERSION,                         ///< Highest possible saveload version