diff options
| author | frosch <frosch@openttd.org> | 2009-11-29 18:46:54 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2009-11-29 18:46:54 +0000 |
| commit | 2784f15304cd329bb7288aa54fb338f8bb335c3b (patch) | |
| tree | 8845b7de7f6ebf3a00a6bdb3722cb0a607796408 | |
| parent | dd1fd66ed67317bf61fae319fe51c6f48e806163 (diff) | |
| download | openttd-2784f15304cd329bb7288aa54fb338f8bb335c3b.tar.xz | |
(svn r18341) -Fix: Replace some GetNextVehicle() with GetNextUnit() where needed.
| -rw-r--r-- | src/train_cmd.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index b1615f17d..77425cedb 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1174,7 +1174,8 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u * row that are being moved. */ if (HasBit(p2, 0)) { const Train *u; - for (u = src_head; u != src && u != NULL; u = u->GetNextVehicle()) { + /* CheckTrainStoppedInDepot() does counts dual-headed engines only once, so also do it here */ + for (u = src_head; u != src && u != NULL; u = u->GetNextUnit()) { src_len--; } } else { @@ -1326,7 +1327,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u /* If we move the front Engine and if the second vehicle is not an engine add the whole vehicle to the DEFAULT_GROUP */ if (src->IsFrontEngine() && !IsDefaultGroupID(src->group_id)) { - Train *v = src->GetNextVehicle(); + Train *v = src->GetNextUnit(); if (v != NULL && v->IsEngine()) { v->group_id = src->group_id; @@ -1520,7 +1521,7 @@ CommandCost CmdSellRailWagon(TileIndex tile, DoCommandFlag flags, uint32 p1, uin /* 2. We are selling the front vehicle, some special action might be required * here, so take attention */ if (v == first) { - Train *new_f = first->GetNextVehicle(); + Train *new_f = first->GetNextUnit(); /* 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, |