dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jgrpp' into save_ext_spp

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-15 15:24:21 +01:00
parent 46103362c3 bcdae2ff21
commit 9716026809
72 changed files with 6356 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/saveload/order_sl.cpp
View File

@@ -111,6 +111,7 @@ const SaveLoad *GetOrderDescription()
SLE_REF(Order, next, REF_ORDER),
SLE_CONDVAR(Order, refit_cargo, SLE_UINT8, 36, SL_MAX_VERSION),
SLE_CONDNULL(1, 36, 181), // refit_subtype
SLE_CONDVAR_X(Order, occupancy, SLE_UINT8, 0, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_ORDER_OCCUPANCY)),
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),