(svn r15187) -Fix: assert when an AI called AIRoad::GetNeighbourRoadCount on a tile at the north edge (bug found by SmatZ).

16 years ago · dcdb771c40
parent 9fd38d1022
commit dcdb771c40
1 changed files with 2 additions and 2 deletions
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@ -422,10 +422,10 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia
 	::RoadTypes rts = ::RoadTypeToRoadTypes((::RoadType)GetCurrentRoadType());
 	int32 neighbour = 0;

-	if (NeighbourHasReachableRoad(rts, tile, DIAGDIR_NE)) neighbour++;
+	if (TileX(tile) > 0 && NeighbourHasReachableRoad(rts, tile, DIAGDIR_NE)) neighbour++;
 	if (NeighbourHasReachableRoad(rts, tile, DIAGDIR_SE)) neighbour++;
 	if (NeighbourHasReachableRoad(rts, tile, DIAGDIR_SW)) neighbour++;
-	if (NeighbourHasReachableRoad(rts, tile, DIAGDIR_NW)) neighbour++;
+	if (TileY(tile) > 0 && NeighbourHasReachableRoad(rts, tile, DIAGDIR_NW)) neighbour++;

 	return neighbour;
 }