From: PatR <rankin@nethack.org>
Date: Mon, 23 May 2022 18:19:38 +0000 (-0700)
Subject: zap.c non-zap buglets
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cb397b50227fcb0d607bcd5f5cc0c100767471a;p=nethack

zap.c non-zap buglets

A couple of things I noticed when trying--and failing, so far--to figure
out the revive panic:
1) revive() treated y==0 as out of map bounds (x==0 is out of bounds
   but y==0 isn't);
2) get_mon_location() might yield stale coordinates for steed (but
   moot since that's only used for mobile lights and no light emitting
   monster can wear a saddle; didn't affect light emitting objects
   carried or worn by monsters).
---

diff --git a/src/zap.c b/src/zap.c
index bc0d60d31..f7c0fc844 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	zap.c	$NHDT-Date: 1651868824 2022/05/06 20:27:04 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.410 $ */
+/* NetHack 3.7	zap.c	$NHDT-Date: 1653329964 2022/05/23 18:19:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.415 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -586,11 +586,12 @@ get_obj_location(struct obj *obj, xchar *xp, xchar *yp, int locflags)
 }
 
 boolean
-get_mon_location(struct monst *mon, xchar *xp, xchar *yp,
-                 int locflags) /* non-zero means get location even if monster
-                                  is buried */
+get_mon_location(
+    struct monst *mon,
+    xchar *xp, xchar *yp,
+    int locflags) /* non-zero means get location even if monster is buried */
 {
-    if (mon == &g.youmonst) {
+    if (mon == &g.youmonst || (u.usteed && mon == u.usteed)) {
         *xp = u.ux;
         *yp = u.uy;
         return TRUE;
@@ -819,7 +820,7 @@ revive(struct obj *corpse, boolean by_hero)
             break; /* x,y are 0 */
         }
     }
-    if (!x || !y
+    if (!x
         /* Rules for revival from containers:
          *  - the container cannot be locked
          *  - the container cannot be heavily nested (>2 is arbitrary)