@@ -1226,13 +1226,13 @@ static void AddWaypoint(const Waypoint *
static void ViewportAddWaypoints(DrawPixelInfo *dpi)
{
const Waypoint *wp;
int left, top, right, bottom;
if (!HasBit(_display_opt, DO_WAYPOINTS))
if (!HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES))
return;
left = dpi->left;
top = dpi->top;
right = left + dpi->width;
bottom = top + dpi->height;
@@ -2013,13 +2013,13 @@ static bool CheckClickOnSign(const ViewP
static bool CheckClickOnWaypoint(const ViewPort *vp, int x, int y)
if (!HasBit(_display_opt, DO_WAYPOINTS) || IsInvisibilitySet(TO_SIGNS)) return false;
if (!HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES) || IsInvisibilitySet(TO_SIGNS)) return false;
switch (vp->zoom) {
case ZOOM_LVL_NORMAL:
x = x - vp->left + vp->virtual_left;
y = y - vp->top + vp->virtual_top;
FOR_ALL_WAYPOINTS(wp) {