|
@@ -87,97 +87,97 @@ Order UnpackOldOrder(uint16 packed)
|
|
|
* Sanity check
|
|
|
* TTD stores invalid orders as OT_NOTHING with non-zero flags/station
|
|
|
*/
|
|
|
if (order.IsType(OT_NOTHING) && packed != 0) order.MakeDummy();
|
|
|
|
|
|
return order;
|
|
|
}
|
|
|
|
|
|
const SaveLoad *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),
|
|
|
SLE_CONDVAR(Order, refit_cargo, SLE_UINT8, 36, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(Order, refit_subtype, SLE_UINT8, 36, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(Order, wait_time, SLE_UINT16, 67, SL_MAX_VERSION),
|
|
|
SLE_CONDVAR(Order, travel_time, SLE_UINT16, 67, 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, 5, 35),
|
|
|
SLE_END()
|
|
|
};
|
|
|
|
|
|
return _order_desc;
|
|
|
}
|
|
|
|
|
|
static void Save_ORDR()
|
|
|
{
|
|
|
Order *order;
|
|
|
|
|
|
FOR_ALL_ORDERS(order) {
|
|
|
SlSetArrayIndex(order->index);
|
|
|
SlObject(order, GetOrderDescription());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void Load_ORDR()
|
|
|
{
|
|
|
if (CheckSavegameVersionOldStyle(5, 2)) {
|
|
|
/* Version older than 5.2 did not have a ->next pointer. Convert them
|
|
|
* (in the old days, the orderlist was 5000 items big) */
|
|
|
size_t len = SlGetFieldLength();
|
|
|
|
|
|
if (CheckSavegameVersion(5)) {
|
|
|
/* Pre-version 5 had an other layout for orders
|
|
|
(uint16 instead of uint32) */
|
|
|
* (uint16 instead of uint32) */
|
|
|
len /= sizeof(uint16);
|
|
|
uint16 *orders = MallocT<uint16>(len + 1);
|
|
|
|
|
|
SlArray(orders, len, SLE_UINT16);
|
|
|
|
|
|
for (size_t i = 0; i < len; ++i) {
|
|
|
Order *o = new (i) Order();
|
|
|
o->AssignOrder(UnpackVersion4Order(orders[i]));
|
|
|
}
|
|
|
|
|
|
free(orders);
|
|
|
} else if (CheckSavegameVersionOldStyle(5, 2)) {
|
|
|
len /= sizeof(uint32);
|
|
|
uint32 *orders = MallocT<uint32>(len + 1);
|
|
|
|
|
|
SlArray(orders, len, SLE_UINT32);
|
|
|
|
|
|
for (size_t i = 0; i < len; ++i) {
|
|
|
new (i) Order(orders[i]);
|
|
|
}
|
|
|
|
|
|
free(orders);
|
|
|
}
|
|
|
|
|
|
/* Update all the next pointer */
|
|
|
Order *o;
|
|
|
FOR_ALL_ORDERS(o) {
|
|
|
/* Delete invalid orders */
|
|
|
if (o->IsType(OT_NOTHING)) {
|
|
|
delete o;
|
|
|
continue;
|
|
|
}
|
|
|
/* The orders were built like this:
|
|
|
* While the order is valid, set the previous will get its next pointer set */
|
|
|
Order *prev = Order::GetIfValid(order_index - 1);
|
|
|
if (prev != NULL) prev->next = o;
|
|
|
}
|
|
|
} else {
|
|
|
int index;
|
|
|
|
|
|
while ((index = SlIterateArray()) != -1) {
|
|
|
Order *order = new (index) Order();
|
|
|
SlObject(order, GetOrderDescription());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void Ptrs_ORDR()
|