diff --git a/src/saveload/compat/vehicle_sl_compat.h b/src/saveload/compat/vehicle_sl_compat.h index 4587dd2824..d9293eef39 100644 --- a/src/saveload/compat/vehicle_sl_compat.h +++ b/src/saveload/compat/vehicle_sl_compat.h @@ -100,7 +100,7 @@ const SaveLoadCompat _vehicle_train_sl_compat[] = { SLC_VAR("common"), SLC_VAR("crash_anim_pos"), SLC_VAR("force_proceed"), - SLC_VAR("railtype"), + SLC_NULL(1, SL_MIN_VERSION, SLV_ENGINE_MULTI_RAILTYPE), SLC_VAR("track"), SLC_VAR("flags"), SLC_NULL(2, SLV_2, SLV_60), diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 6d1f557b3b..8bd04801d5 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1060,13 +1060,12 @@ static bool LoadOldCompany(LoadgameState &ls, int num) static uint32_t _old_order_ptr; static uint16_t _old_next_ptr; static typename VehicleID::BaseType _current_vehicle_id; -static RailType _old_railtype; static const OldChunks vehicle_train_chunk[] = { OCL_SVAR( OC_UINT8, Train, track ), OCL_SVAR( OC_UINT8, Train, force_proceed ), OCL_SVAR( OC_UINT16, Train, crash_anim_pos ), - OCL_VAR ( OC_UINT8, 1, &_old_railtype), + OCL_NULL( 1 ), // railtype OCL_NULL( 5 ), ///< Junk @@ -1306,8 +1305,6 @@ bool LoadOldVehicle(LoadgameState &ls, int num) }; if (v->spritenum / 2 >= lengthof(spriteset_rail)) return false; v->spritenum = spriteset_rail[v->spritenum / 2]; // adjust railway sprite set offset - /* Should be the original values for monorail / rail, can't use RailType constants */ - Train::From(v)->railtypes = static_cast(type == 0x25 ? 1 : 0); break; } @@ -1368,10 +1365,6 @@ bool LoadOldVehicle(LoadgameState &ls, int num) Debug(oldloader, 0, "Loading failed - vehicle-array is invalid"); return false; } - - if (v->type == VEH_TRAIN) { - Train::From(v)->railtypes = _old_railtype; - } } if (_old_order_ptr != 0 && _old_order_ptr != 0xFFFFFFFF) { diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index a20daa3438..51ef51069d 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -793,16 +793,12 @@ public: } }; -static RailType _old_railtype; - class SlVehicleTrain : public DefaultSaveLoadHandler { public: static inline const SaveLoad description[] = { SLEG_STRUCT("common", SlVehicleCommon), SLE_VAR(Train, crash_anim_pos, SLE_UINT16), SLE_VAR(Train, force_proceed, SLE_UINT8), - SLEG_CONDVAR("railtype", _old_railtype, SLE_UINT8, SL_MIN_VERSION, SLV_ENGINE_MULTI_RAILTYPE), - SLE_VAR(Train, railtypes, SLE_UINT64), SLE_VAR(Train, track, SLE_UINT8), SLE_CONDVAR(Train, flags, SLE_FILE_U8 | SLE_VAR_U16, SLV_2, SLV_100), @@ -822,10 +818,6 @@ public: { if (v->type != VEH_TRAIN) return; SlObject(v, this->GetLoadDescription()); - - if (IsSavegameVersionBefore(SLV_ENGINE_MULTI_RAILTYPE)) { - Train::From(v)->railtypes = _old_railtype; - } } void FixPointers(Vehicle *v) const override