diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-02 09:06:15 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-02 09:06:15 +0000 |
| commit | 4d14c1b534947ed38780995af4d68bd67b4ae095 (patch) | |
| tree | 5afca0f6bf0a5a885285f85755c0cdfa42c7d70f /src/roadveh_cmd.cpp | |
| parent | 61e735ba4c62e578ca16f708ac1fdc872ff6416d (diff) | |
| download | openttd-4d14c1b534947ed38780995af4d68bd67b4ae095.tar.xz | |
(svn r16722) -Codechange: unify the naming of the Is/Set/HasArticulatedPart functions
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 7861f0842..50a7d4e95 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -916,7 +916,7 @@ static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u) if (IsTileType(v->tile, MP_STATION)) return; /* For now, articulated road vehicles can't overtake anything. */ - if (v->RoadVehHasArticPart()) return; + if (v->HasArticulatedPart()) return; /* Vehicles are not driving in same direction || direction is not a diagonal direction */ if (v->direction != u->direction || !(v->direction & 1)) return; @@ -1027,7 +1027,7 @@ static Trackdir RoadFindPathToDest(RoadVehicle *v, TileIndex tile, DiagDirection } else if (IsTileType(tile, MP_STATION) && IsStandardRoadStopTile(tile)) { /* Standard road stop (drive-through stops are treated as normal road) */ - if (!IsTileOwner(tile, v->owner) || GetRoadStopDir(tile) == enterdir || v->RoadVehHasArticPart()) { + if (!IsTileOwner(tile, v->owner) || GetRoadStopDir(tile) == enterdir || v->HasArticulatedPart()) { /* different station owner or wrong orientation or the vehicle has articulated parts */ trackdirs = TRACKDIR_BIT_NONE; } else { |