diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index ad0cccb5c0..b53966cb95 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3812,6 +3812,10 @@ bool AfterLoadGame() } } + if (!IsSavegameVersionBefore(SLV_MULTITRACK_LEVEL_CROSSINGS)) { + _settings_game.vehicle.adjacent_crossings = true; + } + /* Compute station catchment areas. This is needed here in case UpdateStationAcceptance is called below. */ Station::RecomputeCatchmentForAll(); diff --git a/src/saveload/saveload_common.h b/src/saveload/saveload_common.h index 9972c816f3..5a9a9d5174 100644 --- a/src/saveload/saveload_common.h +++ b/src/saveload/saveload_common.h @@ -350,6 +350,8 @@ enum SaveLoadVersion : uint16 { SLV_DOCK_DOCKINGTILES, ///< 298 PR#9578 All tiles around docks may be docking tiles. SLV_REPAIR_OBJECT_DOCKING_TILES, ///< 299 PR#9594 v12.0 Fixing issue with docking tiles overlapping objects. SLV_U64_TICK_COUNTER, ///< 300 PR#10035 Make _tick_counter 64bit to avoid wrapping. + SLV_LAST_LOADING_TICK, ///< 301 PR#9693 Store tick of last loading for vehicles. + SLV_MULTITRACK_LEVEL_CROSSINGS, ///< 302 PR#9931 Multi-track level crossings. SL_MAX_VERSION, ///< Highest possible saveload version diff --git a/src/saveload/upstream/vehicle_sl.cpp b/src/saveload/upstream/vehicle_sl.cpp index 84219e22ac..855e472a0a 100644 --- a/src/saveload/upstream/vehicle_sl.cpp +++ b/src/saveload/upstream/vehicle_sl.cpp @@ -172,6 +172,7 @@ public: SLE_CONDVAR(Vehicle, group_id, SLE_UINT16, SLV_60, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, current_order_time, SLE_UINT32, SLV_67, SL_MAX_VERSION), + //SLE_CONDVAR(Vehicle, last_loading_tick, SLE_UINT64, SLV_LAST_LOADING_TICK, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, lateness_counter, SLE_INT32, SLV_67, SL_MAX_VERSION), }; #if defined(_MSC_VER) && (_MSC_VER == 1915 || _MSC_VER == 1916)