miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup 3ac1a2f1e4: Don't load/save a train's railtypes property. (#14618)

Browse Source 
A train's railtypes property is always reset by Train::ConsistChanged on load, so storing is not necessary.
This commit is contained in:
Peter Nelson
2025-09-15 08:21:09 +01:00
committed by GitHub
parent c111abad37
commit 7240ed5817
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/saveload/vehicle_sl.cpp
View File

@@ -793,16 +793,12 @@ public:
}
};
static RailType _old_railtype;
class SlVehicleTrain : public DefaultSaveLoadHandler<SlVehicleTrain, Vehicle> {
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