From 4d14c1b534947ed38780995af4d68bd67b4ae095 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 2 Jul 2009 09:06:15 +0000 Subject: (svn r16722) -Codechange: unify the naming of the Is/Set/HasArticulatedPart functions --- src/articulated_vehicles.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/articulated_vehicles.cpp') diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 8dcb5182f..04a563541 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -207,11 +207,11 @@ bool IsArticulatedVehicleCarryingDifferentCargos(const Vehicle *v, CargoID *carg switch (v->type) { case VEH_TRAIN: - v = Train::From(v)->EngineHasArticPart() ? GetNextArticPart(Train::From(v)) : NULL; + v = Train::From(v)->HasArticulatedPart() ? GetNextArticPart(Train::From(v)) : NULL; break; case VEH_ROAD: - v = RoadVehicle::From(v)->RoadVehHasArticPart() ? v->Next() : NULL; + v = RoadVehicle::From(v)->HasArticulatedPart() ? v->Next() : NULL; break; default: @@ -254,11 +254,11 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v) switch (v->type) { case VEH_TRAIN: - v = Train::From(v)->EngineHasArticPart() ? GetNextArticPart(Train::From(v)) : NULL; + v = Train::From(v)->HasArticulatedPart() ? GetNextArticPart(Train::From(v)) : NULL; break; case VEH_ROAD: - v = RoadVehicle::From(v)->RoadVehHasArticPart() ? v->Next() : NULL; + v = RoadVehicle::From(v)->HasArticulatedPart() ? v->Next() : NULL; break; default: -- cgit v1.2.3-54-g00ecf