|
@@ -930,12 +930,13 @@ void BackupVehicleOrders(const Vehicle *
|
|
|
bak->order = NULL;
|
|
|
free(bak->name);
|
|
|
bak->name = NULL;
|
|
|
|
|
|
/* Save general info */
|
|
|
bak->orderindex = v->cur_order_index;
|
|
|
bak->group = v->group_id;
|
|
|
bak->service_interval = v->service_interval;
|
|
|
if (v->name != NULL) bak->name = strdup(v->name);
|
|
|
|
|
|
/* If we have shared orders, store it on a special way */
|
|
|
if (v->IsOrderListShared()) {
|
|
|
const Vehicle *u = (v->next_shared) ? v->next_shared : v->prev_shared;
|
|
@@ -989,19 +990,30 @@ void RestoreVehicleOrders(const Vehicle
|
|
|
/* CMD_NO_TEST_IF_IN_NETWORK is used here, because CMD_INSERT_ORDER checks if the
|
|
|
* order number is one more than the current amount of orders, and because
|
|
|
* in network the commands are queued before send, the second insert always
|
|
|
* fails in test mode. By bypassing the test-mode, that no longer is a problem. */
|
|
|
for (uint i = 0; bak->order[i].IsValid(); i++) {
|
|
|
if (!DoCommandP(0, v->index + (i << 16), PackOrder(&bak->order[i]), NULL,
|
|
|
CMD_INSERT_ORDER | CMD_NO_TEST_IF_IN_NETWORK))
|
|
|
CMD_INSERT_ORDER | CMD_NO_TEST_IF_IN_NETWORK)) {
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
/* Copy timetable */
|
|
|
if (!DoCommandP(0, v->index | (i << 16) | (1 << 25),
|
|
|
bak->order[i].wait_time << 16 | bak->order[i].travel_time, NULL,
|
|
|
CMD_CHANGE_TIMETABLE | CMD_NO_TEST_IF_IN_NETWORK)) {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/* Restore vehicle order-index and service interval */
|
|
|
DoCommandP(0, v->index, bak->orderindex | (bak->service_interval << 16) , NULL, CMD_RESTORE_ORDER_INDEX);
|
|
|
|
|
|
/* Restore vehicle group */
|
|
|
DoCommandP(0, bak->group, v->index, NULL, CMD_ADD_VEHICLE_GROUP);
|
|
|
}
|
|
|
|
|
|
/** Restore the current order-index of a vehicle and sets service-interval.
|
|
|
* @param tile unused
|
|
|
* @param flags operation to perform
|
|
|
* @param p1 the ID of the vehicle
|