(svn r18679) -Fix (r16993): tile area of waypoints wasn't correctly given to NewGRFs in case of multi tile waypoints

2 files changed, 7 insertions, 6 deletions

diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index e9d9dba11..df57900f4 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -394,7 +394,6 @@ void Station::GetTileArea(TileArea *ta, StationType type) const
 
 		case STATION_DOCK:
 		case STATION_OILRIG:
-		case STATION_BUOY:
 			ta->tile = this->dock_tile;
 			break;
 
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index eeb3bcccf..bc7bf2975 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -33,16 +33,18 @@ void DrawWaypointSprite(int x, int y, int stat_id, RailType railtype)
 void Waypoint::GetTileArea(TileArea *ta, StationType type) const
 {
 	switch (type) {
-		case STATION_BUOY:
 		case STATION_WAYPOINT:
+			*ta = this->train_station;
+			return;
+
+		case STATION_BUOY:
+			ta->tile = this->xy;
+			ta->w    = 1;
+			ta->h    = 1;
 			break;
 
 		default: NOT_REACHED();
 	}
-
-	ta->tile = this->xy;
-	ta->w    = 1;
-	ta->h    = 1;
 }
 
 Waypoint::~Waypoint()