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

(svn r18341) -Fix: Replace some GetNextVehicle() with GetNextUnit() where needed.

release/1.0
frosch 2009-11-29 18:46:54 +00:00
parent dd1fd66ed6
commit 2784f15304
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/train_cmd.cpp
View File

@ -1174,7 +1174,8 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
* row that are being moved. */ * row that are being moved. */
if (HasBit(p2, 0)) { if (HasBit(p2, 0)) {
const Train *u; 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--; src_len--;
} }
} else { } 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 /* If we move the front Engine and if the second vehicle is not an engine
add the whole vehicle to the DEFAULT_GROUP */ add the whole vehicle to the DEFAULT_GROUP */
if (src->IsFrontEngine() && !IsDefaultGroupID(src->group_id)) { if (src->IsFrontEngine() && !IsDefaultGroupID(src->group_id)) {
Train *v = src->GetNextVehicle(); Train *v = src->GetNextUnit();
if (v != NULL && v->IsEngine()) { if (v != NULL && v->IsEngine()) {
v->group_id = src->group_id; 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 /* 2. We are selling the front vehicle, some special action might be required
* here, so take attention */ * here, so take attention */
if (v == first) { 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 /* 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,