From: PatR <rankin@nethack.org>
Date: Tue, 22 Mar 2022 01:11:26 +0000 (-0700)
Subject: eating food while hiding under it
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88a61f1c407f06f7ee815699f64bec7c55ce4b2a;p=nethack

eating food while hiding under it

Fix the bug reported by entrez where you could end up hiding under
nothing if while poly'd into a hides-under creature and hiding under
something edible you ate whatever you were hiding under.  Same thing
could happen if it was a corpse on an altar and you offered it rather
than consumed it.

While in there, fix monsters hiding under cockatrice corpses.  They
won't do that unless there are multiple objects in the pile, but
there was no check for the possible case of all additional objects
also being other cockatrice corpses.
---

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 74314087a..15ba3c0ef 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1,4 +1,4 @@
-NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.839 $ $NHDT-Date: 1646953027 2022/03/10 22:57:07 $
+NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.844 $ $NHDT-Date: 1647911478 2022/03/22 01:11:18 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -842,6 +842,10 @@ life-saving might increase max HP; if level drain triggers that, don't let max
 	HP go up because it confuses healing for monster wielding Stormbringer
 HP recovery and/or max HP boost from eating royal jelly didn't perform a
 	status update to show the change
+if poly'd hero is hiding under food and eats or #offers that food, stop hiding
+hide-under monsters who can be turned to stone aren't able to hide under a
+	cockatrice corpse unless there is something else present but make sure
+	that the other items aren't all more cockatrice corpses
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/mon.c b/src/mon.c
index 1512028b5..78327e257 100644
--- a/src/mon.c
+++ b/src/mon.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	mon.c	$NHDT-Date: 1646688064 2022/03/07 21:21:04 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.415 $ */
+/* NetHack 3.7	mon.c	$NHDT-Date: 1647911478 2022/03/22 01:11:18 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.419 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Derek S. Ray, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -3882,17 +3882,20 @@ maybe_unhide_at(xchar x, xchar y)
 {
     struct monst *mtmp;
 
-    if (!OBJ_AT(x, y) && (mtmp = m_at(x, y)) != 0
-        && mtmp->mundetected && hides_under(mtmp->data))
+    if (OBJ_AT(x, y))
+        return;
+    if ((mtmp = m_at(x, y)) == 0 && u_at(x, y))
+        mtmp = &g.youmonst;
+    if (mtmp && mtmp->mundetected && hides_under(mtmp->data))
         (void) hideunder(mtmp);
 }
 
 /* monster/hero tries to hide under something at the current location */
 boolean
-hideunder(struct monst* mtmp)
+hideunder(struct monst *mtmp)
 {
     struct trap *t;
-    boolean undetected = FALSE, is_u = (mtmp == &g.youmonst);
+    boolean oldundetctd, undetected = FALSE, is_u = (mtmp == &g.youmonst);
     xchar x = is_u ? u.ux : mtmp->mx, y = is_u ? u.uy : mtmp->my;
 
     if (mtmp == u.ustuck) {
@@ -3906,17 +3909,25 @@ hideunder(struct monst* mtmp)
     } else if (hides_under(mtmp->data) && OBJ_AT(x, y)) {
         struct obj *otmp = g.level.objects[x][y];
 
-        /* most monsters won't hide under cockatrice corpse */
-        if (otmp->nexthere || otmp->otyp != CORPSE
-            || (mtmp == &g.youmonst ? Stone_resistance : resists_ston(mtmp))
-            || !touch_petrifies(&mons[otmp->corpsenm]))
+        /* most monsters won't hide under cockatrice corpse but they
+           can hide under a pile containing more than just such corpses */
+        while (otmp && otmp->otyp == CORPSE
+               && touch_petrifies(&mons[otmp->corpsenm]))
+            otmp = otmp->nexthere;
+        if (otmp != 0 || ((mtmp == &g.youmonst) ? Stone_resistance
+                                                : resists_ston(mtmp)))
             undetected = TRUE;
     }
 
-    if (is_u)
-        u.uundetected = undetected;
-    else
-        mtmp->mundetected = undetected;
+    if (is_u) {
+        oldundetctd = u.uundetected != 0;
+        u.uundetected = undetected ? 1 : 0;
+    } else {
+        oldundetctd = mtmp->mundetected != 0;
+        mtmp->mundetected = undetected ? 1 : 0;
+    }
+    if (undetected != oldundetctd)
+        newsym(x, y);
     return undetected;
 }
 
@@ -3938,9 +3949,9 @@ hide_monst(struct monst* mon)
         /* try again if mimic missed its 1/3 chance to hide */
         if (mon->data->mlet == S_MIMIC && !M_AP_TYPE(mon))
             (void) restrap(mon);
+        g.viz_array[y][x] = save_viz;
         if (hider_under)
             (void) hideunder(mon);
-        g.viz_array[y][x] = save_viz;
     }
 }