From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 5 Dec 2018 20:39:11 +0000 (+0200)
Subject: Valid cursor locations showed null
X-Git-Tag: nmake-explicit-path~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f020595fb7cf993067047a43c528e1709f571c52;p=nethack

Valid cursor locations showed null

When getting a cursor location, and there was no "valid" location
function defined, trying to go to the next or previous valid
location showed null.

Fix this by using the "interesting" locations if no valid ones.
---

diff --git a/src/do_name.c b/src/do_name.c
index c1210bbd9..38665135e 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -378,6 +378,10 @@ int x, y, gloc;
                     || IS_UNEXPLORED_LOC(x - 1, y)
                     || IS_UNEXPLORED_LOC(x, y + 1)
                     || IS_UNEXPLORED_LOC(x, y - 1)));
+    case GLOC_VALID:
+        if (getpos_getvalid)
+            return (getpos_getvalid(x,y));
+        /*FALLTHRU*/
     case GLOC_INTERESTING:
         return gather_locs_interesting(x,y, GLOC_DOOR)
             || !(glyph_is_cmap(glyph)
@@ -395,8 +399,6 @@ int x, y, gloc;
                      || glyph_to_cmap(glyph) == S_darkroom
                      || glyph_to_cmap(glyph) == S_corr
                      || glyph_to_cmap(glyph) == S_litcorr));
-    case GLOC_VALID:
-        return (getpos_getvalid && getpos_getvalid(x,y));
     }
     /*NOTREACHED*/
     return FALSE;