From f020595fb7cf993067047a43c528e1709f571c52 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Wed, 5 Dec 2018 22:39:11 +0200 Subject: [PATCH] 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. --- src/do_name.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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;