summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-07-31 13:28:23 +0000
committersmatz <smatz@openttd.org>2008-07-31 13:28:23 +0000
commit5e2c2db235c6c43d6dca81acbe73274d15042ec7 (patch)
tree73e89a39286562a68c6c662e14088e0cddca086c /src
parentb7e64bb5a6f79560d6e7b2afb05a3b1684f237b8 (diff)
downloadopenttd-5e2c2db235c6c43d6dca81acbe73274d15042ec7.tar.xz
(svn r13891) -Fix (r12547): one could click on waypoint and station signs even when they were invisible
Diffstat (limited to 'src')
-rw-r--r--src/viewport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/viewport.cpp b/src/viewport.cpp
index c63375155..91420c30e 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: