From: PatR <rankin@nethack.org>
Date: Mon, 28 Nov 2022 10:08:49 +0000 (-0800)
Subject: github issue #935 - disarming swallowed hero
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8836b321283cf91a789b4ddc934aadda9b74ee2c;p=nethack

github issue #935 - disarming swallowed hero

Issue reported by AndrioCelos:  bullwhip using monster was able to
snatch hero's weapon when hero was engulfed.

Fix is trivial:  when a monster is choosing an item to use, don't
pick bullwhip if hero is engulfed.  Regular attack attempts already
skip engulfed hero.

Fixes #935
---

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 8c8dc26b9..4ee9ace1f 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1057,6 +1057,7 @@ some instances of using up or stealing shop-owned boulder didn't charge for it
 when hero hears an unseen monster reading a scroll, only describe the monster
 	acccurately if hero is not hallucinating and monster is same species
 	as hero's current form
+don't allow monsters to disarm hero with bullwhip if hero is engulfed
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/muse.c b/src/muse.c
index a68ff93d0..47ef16b7a 100644
--- a/src/muse.c
+++ b/src/muse.c
@@ -1963,6 +1963,7 @@ find_misc(struct monst* mtmp)
             && next2u(mtmp->mx, mtmp->my)
             /* don't bother if it can't work (this doesn't
                prevent cursed weapons from being targeted) */
+            && !u.uswallow
             && (canletgo(uwep, "")
                 || (u.twoweap && canletgo(uswapwep, "")))) {
             g.m.misc = obj;