From 54ba75791069594c56dec3c3eb0c84be4aa7a906 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 7 Dec 2023 19:31:30 +0000 Subject: [PATCH] Fix #11556: Missing saveload change for OrderBackup. (#11557) Apply the saveload change from #11468 to OrderBackup and bump again. --- src/saveload/order_sl.cpp | 3 ++- src/saveload/saveload.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index 57f0136e26..cf6849b20d 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -257,7 +257,8 @@ SaveLoadTable GetOrderBackupDescription() SLE_CONDVAR(OrderBackup, cur_implicit_order_index, SLE_UINT8, SLV_176, SL_MAX_VERSION), SLE_CONDVAR(OrderBackup, current_order_time, SLE_UINT32, SLV_176, SL_MAX_VERSION), SLE_CONDVAR(OrderBackup, lateness_counter, SLE_INT32, SLV_176, SL_MAX_VERSION), - SLE_CONDVAR(OrderBackup, timetable_start, SLE_INT32, SLV_176, SL_MAX_VERSION), + SLE_CONDVAR(OrderBackup, timetable_start, SLE_FILE_I32 | SLE_VAR_U64, SLV_176, SLV_TIMETABLE_START_TICKS_FIX), + SLE_CONDVAR(OrderBackup, timetable_start, SLE_UINT64, SLV_TIMETABLE_START_TICKS_FIX, SL_MAX_VERSION), SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SLV_176, SLV_180), SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_UINT16, SLV_180, SL_MAX_VERSION), SLE_REF(OrderBackup, orders, REF_ORDER), diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 5d993b928d..980d017973 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -364,6 +364,7 @@ enum SaveLoadVersion : uint16_t { SLV_STATION_RATING_CHEAT, ///< 320 PR#11346 Add cheat to fix station ratings at 100%. SLV_TIMETABLE_START_TICKS, ///< 321 PR#11468 Convert timetable start from a date to ticks. + SLV_TIMETABLE_START_TICKS_FIX, ///< 322 PR#11557 Fix for missing convert timetable start from a date to ticks. SL_MAX_VERSION, ///< Highest possible saveload version };