diff options
| author | frosch <frosch@openttd.org> | 2011-01-31 20:44:15 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-01-31 20:44:15 +0000 |
| commit | a97d52a29a990132a8a5e4dd60304483617cec50 (patch) | |
| tree | 0d8d42d633feabb438f812cedf0534a3c665074e /src/saveload/vehicle_sl.cpp | |
| parent | 67a5cd0b185158ca4926c8cb45f1735a1001e00b (diff) | |
| download | openttd-a97d52a29a990132a8a5e4dd60304483617cec50.tar.xz | |
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
Diffstat (limited to 'src/saveload/vehicle_sl.cpp')
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 8abcb916b..d1558d966 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -487,7 +487,8 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_VAR(Vehicle, tick_counter, SLE_UINT8), SLE_CONDVAR(Vehicle, running_ticks, SLE_UINT8, 88, SL_MAX_VERSION), - SLE_VAR(Vehicle, cur_order_index, SLE_UINT8), + SLE_VAR(Vehicle, cur_auto_order_index, SLE_UINT8), + SLE_CONDVAR(Vehicle, cur_real_order_index, SLE_UINT8, 158, SL_MAX_VERSION), /* num_orders is now part of OrderList and is not saved but counted */ SLE_CONDNULL(1, 0, 104), |