# HG changeset patch # User KUDr # Date 1149699862 0 # Node ID ebfc6791b13b51c6dd1e04d7d06b4e36ded4428b # Parent 29d0a0b26bca2b6516d183f6853fc7ad68f2b914 (svn r5148) - Fix: [YAPF] RVs can now find depot they are currently in (thanks Darkvater) diff --git a/yapf/yapf_road.cpp b/yapf/yapf_road.cpp --- a/yapf/yapf_road.cpp +++ b/yapf/yapf_road.cpp @@ -430,6 +430,12 @@ if ((GetTileTrackStatus(tile, TRANSPORT_ROAD) & TrackdirToTrackdirBits(trackdir)) == 0) return NULL; + // handle the case when our vehicle is already in the depot tile + if (IsTileType(tile, MP_STREET) && IsTileDepotType(tile, TRANSPORT_ROAD)) { + // only what we need to return is the Depot* + return GetDepotByTile(tile); + } + // default is YAPF type 2 typedef Depot* (*PfnFindNearestDepot)(Vehicle*, TileIndex, Trackdir); PfnFindNearestDepot pfnFindNearestDepot = &CYapfRoadAnyDepot2::stFindNearestDepot;