summaryrefslogtreecommitdiff
path: root/src/articulated_vehicles.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-02 09:06:15 +0000
committerrubidium <rubidium@openttd.org>2009-07-02 09:06:15 +0000
commit4d14c1b534947ed38780995af4d68bd67b4ae095 (patch)
tree5afca0f6bf0a5a885285f85755c0cdfa42c7d70f /src/articulated_vehicles.cpp
parent61e735ba4c62e578ca16f708ac1fdc872ff6416d (diff)
downloadopenttd-4d14c1b534947ed38780995af4d68bd67b4ae095.tar.xz
(svn r16722) -Codechange: unify the naming of the Is/Set/HasArticulatedPart functions
Diffstat (limited to 'src/articulated_vehicles.cpp')
-rw-r--r--src/articulated_vehicles.cpp8
1 files changed, 4 insertions, 4 deletions
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: