mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22761) -Fix (r22708): Make invisible signs un-clickable (Zuu)

release/1.2
planetmaker 2011-08-19 20:54:15 +00:00
parent f1b792cd01
commit 4b3aa9f26e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewport.cpp
View File

@ -1833,6 +1833,9 @@ static bool CheckClickOnStation(const ViewPort *vp, int x, int y)
/* Don't check if the display options are disabled */ /* Don't check if the display options are disabled */
if (!HasBit(_display_opt, is_station ? DO_SHOW_STATION_NAMES : DO_SHOW_WAYPOINT_NAMES)) continue; if (!HasBit(_display_opt, is_station ? DO_SHOW_STATION_NAMES : DO_SHOW_WAYPOINT_NAMES)) continue;
/* Don't check if competitor signs are not shown and the sign isn't owned by the local company */
if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS) && _local_company != st->owner && st->owner != OWNER_NONE) continue;
if (CheckClickOnViewportSign(vp, x, y, &st->sign)) { if (CheckClickOnViewportSign(vp, x, y, &st->sign)) {
if (is_station) { if (is_station) {
ShowStationViewWindow(st->index); ShowStationViewWindow(st->index);
@ -1854,6 +1857,9 @@ static bool CheckClickOnSign(const ViewPort *vp, int x, int y)
const Sign *si; const Sign *si;
FOR_ALL_SIGNS(si) { FOR_ALL_SIGNS(si) {
/* If competitor signs are hidden, don't check signs that aren't owned by local company */
if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS) && _local_company != si->owner) continue;
if (CheckClickOnViewportSign(vp, x, y, &si->sign)) { if (CheckClickOnViewportSign(vp, x, y, &si->sign)) {
HandleClickOnSign(si); HandleClickOnSign(si);
return true; return true;