(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.

-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/ai/api/ai_rail.cpp b/src/ai/api/ai_rail.cpp
index 5986ad82b..7e686aac9 100644
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -45,7 +45,7 @@
 {
 	if (!::IsValidTile(tile)) return false;
 
-	return ::IsTileType(tile, MP_RAILWAY) && ::IsRailWaypointTile(tile);
+	return ::IsRailWaypointTile(tile);
 }
 
 /* static */ bool AIRail::IsRailTypeAvailable(RailType rail_type)
@@ -200,8 +200,7 @@
 {
 	if (!IsRailTile(tile)) return RAILTRACK_INVALID;
 
-	if (IsRailWaypointTile(tile)) return ::GetRailWaypointBits(tile);
-	if (IsRailStationTile(tile)) return ::TrackToTrackBits(::GetRailStationTrack(tile));
+	if (IsRailStationTile(tile) || IsRailWaypointTile(tile)) return ::TrackToTrackBits(::GetRailStationTrack(tile));
 	if (IsLevelCrossingTile(tile)) return ::GetCrossingRailBits(tile);
 	if (IsRailDepotTile(tile)) return ::TRACK_BIT_NONE;
 	return ::GetTrackBits(tile);