diff options
Diffstat (limited to 'src/yapf/yapf_road.cpp')
| -rw-r--r-- | src/yapf/yapf_road.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yapf/yapf_road.cpp b/src/yapf/yapf_road.cpp index 81a6eeb73..853b68e5b 100644 --- a/src/yapf/yapf_road.cpp +++ b/src/yapf/yapf_road.cpp @@ -87,7 +87,7 @@ public: if (v->current_order.IsType(OT_GOTO_STATION) && tile == v->dest_tile) break; // stop if we have just entered the depot - if (IsDepotTypeTile(tile, TRANSPORT_ROAD) && trackdir == DiagdirToDiagTrackdir(ReverseDiagDir(GetRoadDepotDirection(tile)))) { + if (IsRoadDepotTile(tile) && trackdir == DiagdirToDiagTrackdir(ReverseDiagDir(GetRoadDepotDirection(tile)))) { // next time we will reverse and leave the depot break; } @@ -148,7 +148,7 @@ public: /// Called by YAPF to detect if node ends in the desired destination FORCEINLINE bool PfDetectDestination(Node& n) { - bool bDest = IsDepotTypeTile(n.m_segment_last_tile, TRANSPORT_ROAD); + bool bDest = IsRoadDepotTile(n.m_segment_last_tile); return bDest; } @@ -370,7 +370,7 @@ public: // get found depot tile Node *n = Yapf().GetBestNode(); TileIndex depot_tile = n->m_segment_last_tile; - assert(IsDepotTypeTile(depot_tile, TRANSPORT_ROAD)); + assert(IsRoadDepotTile(depot_tile)); Depot* ret = GetDepotByTile(depot_tile); return ret; } @@ -439,7 +439,7 @@ Depot* YapfFindNearestRoadDepot(const Vehicle *v) return NULL; // handle the case when our vehicle is already in the depot tile - if (IsTileType(tile, MP_ROAD) && IsDepotTypeTile(tile, TRANSPORT_ROAD)) { + if (IsRoadDepotTile(tile)) { // only what we need to return is the Depot* return GetDepotByTile(tile); } |