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

(svn r20541) -Fix: when removing a vehicle update the "clone orders of"-vehicle of a backed up order, or remove it if there is no vehicle sharing orders with that vehicle.

Browse Source
This commit is contained in:
rubidium
2010-08-18 15:58:30 +00:00
parent d28985fe8e
commit 287ee8c01d
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/order_backup.cpp
View File

@@ -37,15 +37,10 @@ OrderBackup::OrderBackup(const Vehicle *v)
/* If we have shared orders, store the vehicle we share the order with. */
if (v->IsOrderListShared()) {
const Vehicle *u = (v->FirstShared() == v) ? v->NextShared() : v->FirstShared();
this->clone = u->index;
this->clone = (v->FirstShared() == v) ? v->NextShared() : v->FirstShared();
} else {
/* Else copy the orders */
/* We do not have shared orders */
this->clone = INVALID_VEHICLE;
/* Count the number of orders */
uint cnt = 0;
const Order *order;
@@ -72,9 +67,9 @@ void OrderBackup::RestoreTo(const Vehicle *v)
if (this->name != NULL) DoCommandP(0, v->index, 0, CMD_RENAME_VEHICLE, NULL, this->name);
/* If we had shared orders, recover that */
if (this->clone != INVALID_VEHICLE) {
DoCommandP(0, v->index | (this->clone << 16), CO_SHARE, CMD_CLONE_ORDER);
} else {
if (this->clone != NULL) {
DoCommandP(0, v->index | (this->clone->index << 16), CO_SHARE, CMD_CLONE_ORDER);
} else if (this->orders != NULL) {
/* 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
@@ -140,6 +135,20 @@ void OrderBackup::RestoreTo(const Vehicle *v)
}
}
/* static */ void OrderBackup::ClearVehicle(const Vehicle *v)
{
assert(v != NULL);
OrderBackup *ob;
FOR_ALL_ORDER_BACKUPS(ob) {
if (ob->clone == v) {
/* Get another item in the shared list. */
ob->clone = (v->FirstShared() == v) ? v->NextShared() : v->FirstShared();
/* But if that isn't there, remove it. */
if (ob->clone == NULL) delete ob;
}
}
}
void InitializeOrderBackups()
{
_order_backup_pool.CleanPool();