diff options
author | bjarni <bjarni@openttd.org> | 2007-09-05 10:15:23 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2007-09-05 10:15:23 +0000 |
commit | 7cdf6d1cbe83bb28f56819abc40092f4d865c5ac (patch) | |
tree | 4c5c8c63ea8fbb514fa7bd1574862c409bf2efdc /src/autoreplace_cmd.cpp | |
parent | 1028e2dc91d16bbaf837c74736968e52e3984f99 (diff) | |
download | openttd-7cdf6d1cbe83bb28f56819abc40092f4d865c5ac.tar.xz |
(svn r11045) -Codechange: added a function to tell if a vehicle is the rear part of a dualheaded train engine
Diffstat (limited to 'src/autoreplace_cmd.cpp')
-rw-r--r-- | src/autoreplace_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp index 004d4627e..4791dde3c 100644 --- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -202,7 +202,7 @@ static CommandCost ReplaceVehicle(Vehicle **w, byte flags, Money total_cost) /* Get the vehicle in front of the one we move out */ Vehicle *front = old_v->Previous(); /* If the vehicle in front is the rear end of a dualheaded engine, then we need to use the one in front of that one */ - if (IsMultiheaded(front) && !IsTrainEngine(front)) front = front->Previous(); + if (IsRearDualheaded(front)) front = front->Previous(); /* Now we move the old one out of the train */ DoCommand(0, (INVALID_VEHICLE << 16) | old_v->index, 0, DC_EXEC, CMD_MOVE_RAIL_VEHICLE); /* Add the new vehicle */ @@ -250,7 +250,7 @@ static CommandCost ReplaceVehicle(Vehicle **w, byte flags, Money total_cost) if (old_v->type == VEH_TRAIN && IsFrontEngine(old_v)) { Vehicle *next_veh = GetNextVehicle(old_v); - if (IsMultiheaded(next_veh) && !IsTrainEngine(next_veh)) next_veh = next_veh->Next(); // don't try to move the rear multiheaded engine + if (IsRearDualheaded(next_veh)) next_veh = next_veh->Next(); // don't try to move the rear multiheaded engine if (next_veh != NULL) { /* Verify that the wagons can be placed on the engine in question. * This is done by building an engine, test if the wagons can be added and then sell the test engine. */ @@ -337,7 +337,7 @@ CommandCost MaybeReplaceVehicle(Vehicle *v, bool check, bool display_costs) cost = CommandCost(); w = v; do { - if (w->type == VEH_TRAIN && IsMultiheaded(w) && !IsTrainEngine(w)) { + if (w->type == VEH_TRAIN && IsRearDualheaded(w)) { /* we build the rear ends of multiheaded trains with the front ones */ continue; } |