From 4ccee5a177bd92c42dbb32b0a00a1a108d34edd2 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 31 Jan 2023 19:09:43 +0200 Subject: [PATCH] Use could_reach_item --- include/extern.h | 1 + src/dogmove.c | 3 +-- src/monmove.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/extern.h b/include/extern.h index 6e7e44fd2..33c8da31a 100644 --- a/include/extern.h +++ b/include/extern.h @@ -620,6 +620,7 @@ extern struct obj *droppables(struct monst *); extern int dog_nutrition(struct monst *, struct obj *); extern int dog_eat(struct monst *, struct obj *, coordxy, coordxy, boolean); extern int dog_move(struct monst *, int); +extern boolean could_reach_item(struct monst *, coordxy, coordxy); extern void finish_meating(struct monst *); extern void quickmimic(struct monst *); diff --git a/src/dogmove.c b/src/dogmove.c index cdb19c9a8..06fe85388 100644 --- a/src/dogmove.c +++ b/src/dogmove.c @@ -22,7 +22,6 @@ static int pet_ranged_attk(struct monst *); static long score_targ(struct monst *, struct monst *); static boolean can_reach_location(struct monst *, coordxy, coordxy, coordxy, coordxy); -static boolean could_reach_item(struct monst *, coordxy, coordxy); /* pick a carried item for pet to drop */ struct obj * @@ -1290,7 +1289,7 @@ dog_move(register struct monst *mtmp, } /* check if a monster could pick up objects from a location */ -static boolean +boolean could_reach_item(struct monst *mon, coordxy nx, coordxy ny) { if ((!is_pool(nx, ny) || is_swimmer(mon->data)) diff --git a/src/monmove.c b/src/monmove.c index c0f71b7cc..c12407ba7 100644 --- a/src/monmove.c +++ b/src/monmove.c @@ -1319,8 +1319,7 @@ m_move(register struct monst* mtmp, register int after) water location accepts flyers, but they can't reach underwater objects, so being able to move to a spot is insufficient for deciding whether to do so */ - if ((is_pool(xx, yy) && !is_swimmer(ptr)) - || (is_lava(xx, yy) && !likes_lava(ptr))) + if (!could_reach_item(mtmp, xx, yy)) continue; /* ignore obj if there's a trap and monster knows it */ -- 2.50.1