(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, 1 insertions, 1 deletions

diff --git a/src/viewport.cpp b/src/viewport.cpp
index ceb2d6be0..e62ce5be9 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1218,7 +1218,7 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
 
 static void AddWaypoint(const Waypoint *wp, StringID str, uint16 width)
 {
-	AddStringToDraw(wp->sign.left + 1, wp->sign.top + 1, str, wp->index, 0, (wp->delete_ctr != 0 ? 0xE : _company_colours[wp->owner]), width);
+	AddStringToDraw(wp->sign.left + 1, wp->sign.top + 1, str, wp->index, 0, (wp->owner == OWNER_NONE || (wp->facilities & ~FACIL_WAYPOINT) == 0) ? 0xE : _company_colours[wp->owner], width);
 }