@ -370,7 +370,7 @@ public:
/* our source tile will be the next vehicle tile (should be the given one) */
TileIndex src_tile = tile ;
/* get available trackdirs on the start tile */
TrackdirBits src_trackdirs = TrackStatusToTrackdirBits( GetTileTrackStatus ( tile , TRANSPORT_ROAD , GetRoadTramType ( v - > roadtype ) ) ) ;
TrackdirBits src_trackdirs = GetTrackdirBitsForRoad( tile , GetRoadTramType ( v - > roadtype ) ) ;
/* select reachable trackdirs only */
src_trackdirs & = DiagdirReachesTrackdirs ( enterdir ) ;
@ -468,7 +468,7 @@ public:
/* set origin (tile, trackdir) */
TileIndex src_tile = v - > tile ;
Trackdir src_td = v - > GetVehicleTrackdir ( ) ;
if ( ! HasTrackdir ( TrackStatusToTrackdirBits( GetTileTrackStatus ( src_tile , TRANSPORT_ROAD , this - > IsTram ( ) ? RTT_TRAM : RTT_ROAD ) ) , src_td ) ) {
if ( ! HasTrackdir ( GetTrackdirBitsForRoad( src_tile , this - > IsTram ( ) ? RTT_TRAM : RTT_ROAD ) , src_td ) ) {
/* sometimes the roadveh is not on the road (it resides on non-existing track)
* how should we handle that situation ? */
return false ;
@ -548,7 +548,8 @@ FindDepotData YapfRoadVehicleFindNearestDepot(const RoadVehicle *v, int max_dist
{
TileIndex tile = v - > tile ;
Trackdir trackdir = v - > GetVehicleTrackdir ( ) ;
if ( ! HasTrackdir ( TrackStatusToTrackdirBits ( GetTileTrackStatus ( tile , TRANSPORT_ROAD , GetRoadTramType ( v - > roadtype ) ) ) , trackdir ) ) {
if ( ! HasTrackdir ( GetTrackdirBitsForRoad ( tile , GetRoadTramType ( v - > roadtype ) ) , trackdir ) ) {
return FindDepotData ( ) ;
}