nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

zap.c non-zap buglets

Browse Source 
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).
This commit is contained in:
PatR
2022-05-23 11:19:38 -07:00
parent 9a21e55830
commit 4cb397b502
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zap.c
View File

@@ -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)