--- a/src/ai/api/ai_tile.cpp	Thu Jun 12 11:15:59 2008 +0000
+++ b/src/ai/api/ai_tile.cpp	Thu Jun 12 13:24:33 2008 +0000
@@ -25,15 +25,15 @@
 		default: return false;
 		case MP_CLEAR: return true;
 		case MP_TREES: return true;
-		case MP_WATER:
-			if (IsCoast(tile)) return true;
-			return false;
+		case MP_WATER: return IsCoast(tile);
 		case MP_ROAD:
+			/* Tram bits aren't considered buildable */
+			if (::GetRoadTypes(tile) != ROADTYPES_ROAD) return false;
 			/* Depots aren't considered buildable */
 			if (::GetRoadTileType(tile) == ROAD_TILE_DEPOT) return false;
-			if (CountBits(GetAllRoadBits(tile)) != 1) return false;
-			if (IsRoadOwner(tile, ROADTYPE_ROAD, OWNER_TOWN)) return true;
-			if (IsRoadOwner(tile, ROADTYPE_ROAD, _current_player)) return true;
+			if (CountBits(::GetRoadBits(tile, ROADTYPE_ROAD)) != 1) return false;
+			if (::IsRoadOwner(tile, ROADTYPE_ROAD, OWNER_TOWN)) return true;
+			if (::IsRoadOwner(tile, ROADTYPE_ROAD, _current_player)) return true;
 			return false;
 	}
 }