|
@@ -96,13 +96,13 @@ Order UnpackOldOrder(uint16 packed)
|
|
|
*/
|
|
|
if (order.IsType(OT_NOTHING) && packed != 0) order.MakeDummy();
|
|
|
|
|
|
return order;
|
|
|
}
|
|
|
|
|
|
const SaveLoad *GetOrderDescription()
|
|
|
SaveLoadTable GetOrderDescription()
|
|
|
{
|
|
|
static const SaveLoad _order_desc[] = {
|
|
|
SLE_VAR(Order, type, SLE_UINT8),
|
|
|
SLE_VAR(Order, flags, SLE_UINT8),
|
|
|
SLE_VAR(Order, dest, SLE_UINT16),
|
|
|
SLE_REF(Order, next, REF_ORDER),
|
|
@@ -112,13 +112,12 @@ const SaveLoad *GetOrderDescription()
|
|
|
SLE_CONDVAR(Order, travel_time, SLE_UINT16, SLV_67, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(Order, max_speed, SLE_UINT16, SLV_172, SL_MAX_VERSION),
|
|
|
|
|
|
/* Leftover from the minor savegame version stuff
|
|
|
* We will never use those free bytes, but we have to keep this line to allow loading of old savegames */
|
|
|
SLE_CONDNULL(10, SLV_5, SLV_36),
|
|
|
SLE_END()
|
|
|
};
|
|
|
|
|
|
return _order_desc;
|
|
|
}
|
|
|
|
|
|
static void Save_ORDR()
|
|
@@ -193,17 +192,16 @@ static void Ptrs_ORDR()
|
|
|
|
|
|
for (Order *o : Order::Iterate()) {
|
|
|
SlObject(o, GetOrderDescription());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
const SaveLoad *GetOrderListDescription()
|
|
|
SaveLoadTable GetOrderListDescription()
|
|
|
{
|
|
|
static const SaveLoad _orderlist_desc[] = {
|
|
|
SLE_REF(OrderList, first, REF_ORDER),
|
|
|
SLE_END()
|
|
|
};
|
|
|
|
|
|
return _orderlist_desc;
|
|
|
}
|
|
|
|
|
|
static void Save_ORDL()
|
|
@@ -230,13 +228,13 @@ static void Ptrs_ORDL()
|
|
|
{
|
|
|
for (OrderList *list : OrderList::Iterate()) {
|
|
|
SlObject(list, GetOrderListDescription());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
const SaveLoad *GetOrderBackupDescription()
|
|
|
SaveLoadTable GetOrderBackupDescription()
|
|
|
{
|
|
|
static const SaveLoad _order_backup_desc[] = {
|
|
|
SLE_VAR(OrderBackup, user, SLE_UINT32),
|
|
|
SLE_VAR(OrderBackup, tile, SLE_UINT32),
|
|
|
SLE_VAR(OrderBackup, group, SLE_UINT16),
|
|
|
SLE_CONDVAR(OrderBackup, service_interval, SLE_FILE_U32 | SLE_VAR_U16, SL_MIN_VERSION, SLV_192),
|
|
@@ -249,13 +247,12 @@ const SaveLoad *GetOrderBackupDescriptio
|
|
|
SLE_CONDVAR(OrderBackup, current_order_time, SLE_UINT32, SLV_176, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(OrderBackup, lateness_counter, SLE_INT32, SLV_176, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(OrderBackup, timetable_start, SLE_INT32, SLV_176, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U16, SLV_176, SLV_180),
|
|
|
SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_UINT16, SLV_180, SL_MAX_VERSION),
|
|
|
SLE_REF(OrderBackup, orders, REF_ORDER),
|
|
|
SLE_END()
|
|
|
};
|
|
|
|
|
|
return _order_backup_desc;
|
|
|
}
|
|
|
|
|
|
static void Save_BKOR()
|