diff options
| author | bjarni <bjarni@openttd.org> | 2007-06-09 18:31:04 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-06-09 18:31:04 +0000 |
| commit | 3afea2d67389dba25e0ea20b443710f1020b9f05 (patch) | |
| tree | f225dff6a8923d03219dfa8e2bc46478e862ea72 | |
| parent | ec25b71bd4a83524213cea84d425d6b6718a3660 (diff) | |
| download | openttd-3afea2d67389dba25e0ea20b443710f1020b9f05.tar.xz | |
(svn r10077) -Fix: FS#845 Cloning Trains Longer Than 8 Units Causes Crash
The problem was that if adding units to the clone (wagon by wagon) failed, then cloning wouldn't notice it and it made two half trains
Now it detects this case and it will make cloning fail. The string with the explanation for the failed move will be used in the error message so the user will know why it failed.
| -rw-r--r-- | src/vehicle.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d813414d4..47b8b7c5c 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1825,7 +1825,14 @@ int32 CmdCloneVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (v->type == VEH_TRAIN && !IsFrontEngine(v)) { /* this s a train car * add this unit to the end of the train */ - DoCommand(0, (w_rear->index << 16) | w->index, 1, flags, CMD_MOVE_RAIL_VEHICLE); + int32 result = DoCommand(0, (w_rear->index << 16) | w->index, 1, flags, CMD_MOVE_RAIL_VEHICLE); + if (CmdFailed(result)) { + /* The train can't be joined to make the same consist as the original. + * Sell what we already made (clean up) and return an error. */ + DoCommand(w_front->tile, w_front->index, 1, flags, GetCmdSellVeh(w_front)); + DoCommand(w_front->tile, w->index, 1, flags, GetCmdSellVeh(w)); + return result; // return error and the message returned from CMD_MOVE_RAIL_VEHICLE + } } else { /* this is a front engine or not a train. It need orders */ w_front = w; |