petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r16722) -Codechange: unify the naming of the Is/Set/HasArticulatedPart functions

Browse Source
This commit is contained in:
rubidium
2009-07-02 09:06:15 +00:00
parent 61e735ba4c
commit 4d14c1b534
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/articulated_vehicles.cpp
View File

@@ -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: