diff options
| author | frosch <frosch@openttd.org> | 2013-02-24 16:41:51 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-02-24 16:41:51 +0000 |
| commit | 22bb015f3d1f172227a74cb6d9d0bc96378f452a (patch) | |
| tree | a4172aa3b01136ea21375fcb88b70b72555dbbff /src/saveload | |
| parent | 205543f727b5a4e0084c1eceb433eac8fa0a327b (diff) | |
| download | openttd-22bb015f3d1f172227a74cb6d9d0bc96378f452a.tar.xz | |
(svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/order_sl.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index 4d2a4b02e..823416579 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -107,7 +107,7 @@ const SaveLoad *GetOrderDescription() SLE_VAR(Order, dest, SLE_UINT16), SLE_REF(Order, next, REF_ORDER), SLE_CONDVAR(Order, refit_cargo, SLE_UINT8, 36, SL_MAX_VERSION), - SLE_CONDVAR(Order, refit_subtype, SLE_UINT8, 36, SL_MAX_VERSION), + SLE_CONDNULL(1, 36, 181), // refit_subtype SLE_CONDVAR(Order, wait_time, SLE_UINT16, 67, SL_MAX_VERSION), SLE_CONDVAR(Order, travel_time, SLE_UINT16, 67, SL_MAX_VERSION), SLE_CONDVAR(Order, max_speed, SLE_UINT16, 172, SL_MAX_VERSION), diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index fe2fdba06..bc1edebb8 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -639,7 +639,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) /* Refit in current order */ SLE_CONDVAR(Vehicle, current_order.refit_cargo, SLE_UINT8, 36, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, current_order.refit_subtype, SLE_UINT8, 36, SL_MAX_VERSION), + SLE_CONDNULL(1, 36, 181), // refit_subtype /* Timetable in current order */ SLE_CONDVAR(Vehicle, current_order.wait_time, SLE_UINT16, 67, SL_MAX_VERSION), |