diff options
| author | rubidium <rubidium@openttd.org> | 2009-12-02 18:18:56 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-12-02 18:18:56 +0000 |
| commit | 0ef0e1379534c6372ea93790c1e4b0855c8077d1 (patch) | |
| tree | d044e4280831f6afdf44626ee303896ef8570c6b /src/saveload | |
| parent | 429f3993f8dc380780a23a6f46420797a9a8a11c (diff) | |
| download | openttd-0ef0e1379534c6372ea93790c1e4b0855c8077d1.tar.xz | |
(svn r18385) -Cleanup: remove the now unneeded multistop slot management code
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 7 | ||||
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 438c1069a..2d7013291 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -1088,13 +1088,6 @@ bool AfterLoadGame() RoadVehicle *rv; FOR_ALL_ROADVEHICLES(rv) { rv->vehstatus &= ~0x40; - rv->slot = NULL; - rv->slot_age = 0; - } - } else { - RoadVehicle *rv; - FOR_ALL_ROADVEHICLES(rv) { - if (rv->slot != NULL) rv->slot->num_vehicles++; } } diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index e08e533fc..cf646141e 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -558,9 +558,9 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_VAR(RoadVehicle, crashed_ctr, SLE_UINT16), SLE_VAR(RoadVehicle, reverse_ctr, SLE_UINT8), - SLE_CONDREF(RoadVehicle, slot, REF_ROADSTOPS, 6, SL_MAX_VERSION), - SLE_CONDNULL(1, 6, SL_MAX_VERSION), - SLE_CONDVAR(RoadVehicle, slot_age, SLE_UINT8, 6, SL_MAX_VERSION), + SLE_CONDNULL(2, 6, 68), + SLE_CONDNULL(4, 69, 130), + SLE_CONDNULL(2, 6, 130), /* reserve extra space in savegame here. (currently 16 bytes) */ SLE_CONDNULL(16, 2, SL_MAX_VERSION), |