mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14405) -Fix [FS#2289]: Correct handling of selling free wagons while the following vehicle is an engine (i.e. a new train is created).

This commit is contained in:
frosch 2008-09-26 19:25:49 +00:00
parent 257f7a229b
commit 05d8a0ebad
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/train_cmd.cpp
View File

@ -1422,32 +1422,43 @@ CommandCost CmdSellRailWagon(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
} }
} }
/* 2. We are selling the first engine, some special action might be required /* 2. We are selling the front vehicle, some special action might be required
* here, so take attention */ * here, so take attention */
if ((flags & DC_EXEC) && v == first) { if (v == first) {
Vehicle *new_f = GetNextVehicle(first); Vehicle *new_f = GetNextVehicle(first);
/* 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 && IsTrainEngine(new_f)) { if (new_f != NULL && IsTrainEngine(new_f)) {
switch_engine = true; if (IsTrainEngine(first)) {
/* Let the new front engine take over the setup of the old engine */
switch_engine = true;
/* Make sure the group counts stay correct. */ if (flags & DC_EXEC) {
new_f->group_id = first->group_id; /* Make sure the group counts stay correct. */
first->group_id = DEFAULT_GROUP; new_f->group_id = first->group_id;
first->group_id = DEFAULT_GROUP;
/* Copy orders (by sharing) */ /* Copy orders (by sharing) */
new_f->orders = first->orders; new_f->orders = first->orders;
new_f->num_orders = first->num_orders; new_f->num_orders = first->num_orders;
new_f->AddToShared(first); new_f->AddToShared(first);
DeleteVehicleOrders(first); DeleteVehicleOrders(first);
/* Copy other important data from the front engine */ /* Copy other important data from the front engine */
new_f->CopyVehicleConfigAndStatistics(first); new_f->CopyVehicleConfigAndStatistics(first);
/* If we deleted a window then open a new one for the 'new' train */ /* If we deleted a window then open a new one for the 'new' train */
if (IsLocalPlayer() && w != NULL) ShowVehicleViewWindow(new_f); if (IsLocalPlayer() && w != NULL) ShowVehicleViewWindow(new_f);
}
} else {
/* We are selling a free wagon, and construct a new train at the same time.
* This needs lots of extra checks (e.g. train limit), which are done by first moving
* the remaining vehicles to a new row */
cost.AddCost(DoCommand(0, new_f->index | INVALID_VEHICLE << 16, 1, flags, CMD_MOVE_RAIL_VEHICLE));
if (cost.Failed()) return cost;
}
} }
} }