mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14092) -Cleanup (r14083): dead code, i.e. unused function.

release/0.7
rubidium 2008-08-17 11:52:06 +00:00
parent 11a20379f3
commit 2f7c20eccd
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/order_cmd.cpp
View File

@ -1341,42 +1341,6 @@ void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
DoCommandP(0, bak->group, v->index, NULL, CMD_ADD_VEHICLE_GROUP); DoCommandP(0, bak->group, v->index, NULL, CMD_ADD_VEHICLE_GROUP);
} }
/** Restores vehicle orders that was previously backed up by BackupVehicleOrders()
* This will restore to the point where it was at the time of the backup meaning
* it will presume the same order indexes can be used.
* This is needed when restoring a backed up vehicle
* @param v The vehicle that should gain the orders
* @param bak the backup of the orders
*/
void RestoreVehicleOrdersBruteForce(Vehicle *v, const BackuppedOrders *bak)
{
if (bak->name != NULL) {
/* Restore the name. */
v->name = strdup(bak->name);
}
/* If we had shared orders, recover that */
if (bak->clone != INVALID_VEHICLE) {
/* We will place it at the same location in the linked list as it previously was. */
if (v->prev_shared != NULL) {
assert(v->prev_shared->next_shared == v->next_shared);
v->prev_shared->next_shared = v;
}
if (v->next_shared != NULL) {
assert(v->next_shared->prev_shared == v->prev_shared);
v->next_shared->prev_shared = v;
}
} else {
/* Restore the orders at the indexes they originally were. */
for (Order *order = bak->order; order->IsValid(); order++) {
Order *dst = GetOrder(order->index);
/* Since we are restoring something we removed a moment ago all the orders should be free. */
assert(!dst->IsValid());
memcpy(dst, order, sizeof(Order));
}
}
}
/** Restore the current order-index of a vehicle and sets service-interval. /** Restore the current order-index of a vehicle and sets service-interval.
* @param tile unused * @param tile unused
* @param flags operation to perform * @param flags operation to perform

1
src/order_func.h
View File

@ -28,7 +28,6 @@ extern BackuppedOrders _backup_orders_data;
void BackupVehicleOrders(const Vehicle *v, BackuppedOrders *order = &_backup_orders_data); void BackupVehicleOrders(const Vehicle *v, BackuppedOrders *order = &_backup_orders_data);
void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *order = &_backup_orders_data); void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *order = &_backup_orders_data);
void RestoreVehicleOrdersBruteForce(Vehicle *v, const BackuppedOrders *bak);
/* Functions */ /* Functions */
void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination); void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination);