From 5e2c2db235c6c43d6dca81acbe73274d15042ec7 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Thu, 31 Jul 2008 13:28:23 +0000
Subject: [PATCH] (svn r13891) -Fix (r12547): one could click on waypoint and
 station signs even when they were invisible

---
 src/viewport.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/viewport.cpp b/src/viewport.cpp
index c63375155d..91420c30e1 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1805,7 +1805,7 @@ static bool CheckClickOnStation(const ViewPort *vp, int x, int y)
 {
 	const Station *st;
 
-	if (!HasBit(_display_opt, DO_SHOW_STATION_NAMES)) return false;
+	if (!HasBit(_display_opt, DO_SHOW_STATION_NAMES) || IsInvisibilitySet(TO_SIGNS)) return false;
 
 	switch (vp->zoom) {
 		case ZOOM_LVL_NORMAL:
@@ -1922,7 +1922,7 @@ static bool CheckClickOnWaypoint(const ViewPort *vp, int x, int y)
 {
 	const Waypoint *wp;
 
-	if (!HasBit(_display_opt, DO_WAYPOINTS)) return false;
+	if (!HasBit(_display_opt, DO_WAYPOINTS) || IsInvisibilitySet(TO_SIGNS)) return false;
 
 	switch (vp->zoom) {
 		case ZOOM_LVL_NORMAL: