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

pull request #1175 - obj->corpsenm fixes

Browse Source 
Pull request by mkuoppal:  some objects which use the corpsenm field
to access the mons[] array can have a corpsenm value of NON_PM (-1)
and weren't avoiding array access in those cases.

In addition to a fixes entry for it, this makes some revisions to the
commited code, handling a few of the cases differently.

Closes #1175
This commit is contained in:
PatR
2024-01-06 15:13:31 -08:00
parent 4669676fc0
commit 83bdf71932
5 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mon.c
View File

@@ -11,7 +11,6 @@ static void sanity_check_single_mon(struct monst *, boolean, const char *);
static struct obj *make_corpse(struct monst *, unsigned);
static int minliquid_core(struct monst *);
static void m_calcdistress(struct monst *);
static boolean mstoning(const struct obj *obj);
static boolean monlineu(struct monst *, int, int);
static long mm_2way_aggression(struct monst *, struct monst *);
static long mm_aggression(struct monst *, struct monst *);
@@ -1157,24 +1156,13 @@ meatbox(struct monst *mon, struct obj *otmp)
}
}
static boolean
mstoning(const struct obj *obj)
{
const int nm = obj->corpsenm;
#define mstoning(obj) \
(ofood(obj) && obj->corpsenm >= LOW_PM \
&& flesh_petrifies(&mons[obj->corpsenm]))
if (nm < LOW_PM)
return FALSE;
if (nm == PM_MEDUSA)
return TRUE;
return ofood(obj) && touch_petrifies(&mons[nm]);
}
/* monster consumes an object.
monster may die, polymorph, grow up, heal, etc; meating is not changed.
object is extracted from any linked list and freed. */
/* Monster mtmp consumes an object.
Monster may die, polymorph, grow up, heal, etc; meating is not changed.
Object is extracted from any linked list and freed. */
void
m_consume_obj(struct monst *mtmp, struct obj *otmp)
{
@@ -1429,8 +1417,10 @@ meatobj(struct monst* mtmp) /* for gelatinous cubes */
return (count > 0 || ecount > 0) ? 1 : 0;
}
#undef mstoning
/* Monster eats a corpse off the ground.
* Return value is 0 = nothing eaten, 1 = ate a corpse, 2 = died */
Return value is 0 = nothing eaten, 1 = ate a corpse, 2 = died. */
int
meatcorpse(
struct monst *mtmp) /* for purple worms and other voracious monsters */