From 30bce1ec6b7cd156ab2b77eb37166c88b2e20a0e Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 3 Apr 2015 12:29:58 +0300 Subject: [PATCH] Suggest only accessible positions for polearms and jumping --- src/apply.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/apply.c b/src/apply.c index aec7550a2..10bfdfd23 100644 --- a/src/apply.c +++ b/src/apply.c @@ -1403,7 +1403,8 @@ int state; for (dy = -4; dy <= 4; dy++) { x = dx + (int)u.ux; y = dy + (int)u.uy; - if (isok(x,y) && is_valid_jump_pos(x,y, jumping_is_magic, FALSE)) + if (isok(x,y) && ACCESSIBLE(levl[x][y].typ) && + is_valid_jump_pos(x,y, jumping_is_magic, FALSE)) tmp_at(x,y); } } else { @@ -2611,7 +2612,7 @@ int state; for (dy = -4; dy <= 4; dy++) { x = dx + (int)u.ux; y = dy + (int)u.uy; - if (isok(x, y) && + if (isok(x, y) && ACCESSIBLE(levl[x][y].typ) && distu(x, y) >= polearm_range_min && distu(x, y) <= polearm_range_max) { tmp_at(x, y);