cpp/openttd-patchpack/source Changeset - r23639:eaf22d89c482

Changeset - r23639:eaf22d89c482

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

PeterN - 5 years ago 2019-04-20 16:49:54
peter@fuzzle.org

Fix e8d397e: Invisible station/waypoint signs could still be clicked on. (#7531)

1 file changed with 5 insertions and 3 deletions:

src/viewport.cpp

0 comments (0 inline, 0 general)

src/viewport.cpp

➞

Show inline comments

@@ @@ -1999,15 +1999,17 @@ static bool CheckClickOnViewportSign(con @@
  */
 static bool CheckClickOnViewportSign(const ViewPort *vp, int x, int y)
+{
 	if (_game_mode == GM_MENU) return false;
 	x = ScaleByZoom(x - vp->left, vp->zoom) + vp->virtual_left;
 	y = ScaleByZoom(y - vp->top, vp->zoom) + vp->virtual_top;
 	Rect search_rect{ x - 1, y - 1, x + 1, y + 1 };
 	search_rect = ExpandRectWithViewportSignMargins(search_rect, vp->zoom);
 	bool show_stations = HasBit(_display_opt, DO_SHOW_STATION_NAMES) && _game_mode != GM_MENU;
 	bool show_waypoints = HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES) && _game_mode != GM_MENU;
 	bool show_towns = HasBit(_display_opt, DO_SHOW_TOWN_NAMES) && _game_mode != GM_MENU;
 	bool show_stations = HasBit(_display_opt, DO_SHOW_STATION_NAMES) && !IsInvisibilitySet(TO_SIGNS);
 	bool show_waypoints = HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES) && !IsInvisibilitySet(TO_SIGNS);
 	bool show_towns = HasBit(_display_opt, DO_SHOW_TOWN_NAMES);
 	bool show_signs = HasBit(_display_opt, DO_SHOW_SIGNS) && !IsInvisibilitySet(TO_SIGNS);
 	bool show_competitors = HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS);

0 comments (0 inline, 0 general)