From d86e17d65adebad6f0213451b99645be3494ea45 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 1 Jul 2009 23:57:20 +0000 Subject: (svn r16719) -Codechange: make IsArticulatedPart(), IsTrainEngine(), IsTrainWagon(), IsMultiheaded(), EngineHasArticPart() and IsRearDualheaded() members of Train --- src/vehicle_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/vehicle_cmd.cpp') diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 071cc170c..19b84219f 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -367,7 +367,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint v = v_front; do { - if (v->type == VEH_TRAIN && IsRearDualheaded(v)) { + if (v->type == VEH_TRAIN && Train::From(v)->IsRearDualheaded()) { /* we build the rear ends of multiheaded trains with the front ones */ continue; } @@ -437,7 +437,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint if (CmdSucceeded(cost)) total_cost.AddCost(cost); } - if (w->type == VEH_TRAIN && EngineHasArticPart(w)) { + if (w->type == VEH_TRAIN && Train::From(w)->EngineHasArticPart()) { w = GetNextArticPart(Train::From(w)); } else if (w->type == VEH_ROAD && RoadVehHasArticPart(w)) { w = w->Next(); @@ -453,7 +453,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint } } - if (v->type == VEH_TRAIN && EngineHasArticPart(v)) { + if (v->type == VEH_TRAIN && Train::From(v)->EngineHasArticPart()) { v = GetNextArticPart(Train::From(v)); } else if (v->type == VEH_ROAD && RoadVehHasArticPart(v)) { v = v->Next(); -- cgit v1.2.3-54-g00ecf