From 9e3763cfb3375277cc8ed9fa9ab085142a97f6c5 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 10 Sep 2023 22:35:03 +0200 Subject: [PATCH] Fix b0e73277: save/load next_station for CargoPacket again --- src/saveload/cargopacket_sl.cpp | 2 ++ src/saveload/compat/cargopacket_sl_compat.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp index 0332b8a4b9..dd7036c03f 100644 --- a/src/saveload/cargopacket_sl.cpp +++ b/src/saveload/cargopacket_sl.cpp @@ -88,6 +88,8 @@ 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), diff --git a/src/saveload/compat/cargopacket_sl_compat.h b/src/saveload/compat/cargopacket_sl_compat.h index 2622d6e692..eee308bcb0 100644 --- a/src/saveload/compat/cargopacket_sl_compat.h +++ b/src/saveload/compat/cargopacket_sl_compat.h @@ -16,7 +16,7 @@ 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"),