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

(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.

release/0.6
rubidium 2007-03-18 15:32:42 +00:00
parent 693c2f12cb
commit 84d9f832c3
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/train_cmd.cpp
View File

@ -1334,30 +1334,37 @@ int32 CmdSellRailWagon(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
for (Vehicle *tmp = first; tmp != NULL; tmp = tmp->next) tmp->first = NULL; for (Vehicle *tmp = first; tmp != NULL; tmp = tmp->next) tmp->first = NULL;
/* 2.2 If there are wagons present after the deleted front engine, check /* 2.2 If there are wagons present after the deleted front engine, check
* if the second wagon (which will be first) is an engine. If it is one, * if the second wagon (which will be first) is an engine. If it is one,
* promote it as a new train, retaining the unitnumber, orders */ * promote it as a new train, retaining the unitnumber, orders */
if (new_f != NULL) { if (new_f != NULL && IsTrainEngine(new_f)) {
if (IsTrainEngine(new_f)) { switch_engine = true;
switch_engine = true; /* Copy important data from the front engine */
/* Copy important data from the front engine */ new_f->unitnumber = first->unitnumber;
new_f->unitnumber = first->unitnumber; new_f->current_order = first->current_order;
new_f->current_order = first->current_order; new_f->cur_order_index = first->cur_order_index;
new_f->cur_order_index = first->cur_order_index; new_f->orders = first->orders;
new_f->orders = first->orders; new_f->num_orders = first->num_orders;
if (first->prev_shared != NULL) {
first->prev_shared->next_shared = new_f;
new_f->prev_shared = first->prev_shared;
}
if (first->next_shared != NULL) { if (first->prev_shared != NULL) {
first->next_shared->prev_shared = new_f; first->prev_shared->next_shared = new_f;
new_f->next_shared = first->next_shared; new_f->prev_shared = first->prev_shared;
}
new_f->num_orders = first->num_orders;
first->orders = NULL; // XXX - to not to delete the orders */
if (IsLocalPlayer()) ShowTrainViewWindow(new_f);
} }
if (first->next_shared != NULL) {
first->next_shared->prev_shared = new_f;
new_f->next_shared = first->next_shared;
}
/*
* Remove all order information from the front train, to
* prevent the order and the shared order list to be
* destroyed by Destroy/DeleteVehicle.
*/
first->orders = NULL;
first->prev_shared = NULL;
first->next_shared = NULL;
if (IsLocalPlayer()) ShowTrainViewWindow(new_f);
} }
} }