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

shapechanger crash fix

Browse Source 
A recent change was setting mon->data prior to canspotmon(mon) but
that triggered a crash if the temporary mon->data was Null.  All the
testing was done with vampshifers and this affects non-vampshifers.

Push even more shapechange messaging into newcham() by not trying to
determine whether requesting a message from it will oblige.
This commit is contained in:
PatR
2024-07-30 11:52:34 -07:00
parent e911c71320
commit e550436755
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mon.c
+3 -16
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 mon.c $NHDT-Date: 1722116051 2024/07/27 21:34:11 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.583 $ */ /* NetHack 3.7 mon.c $NHDT-Date: 1722365546 2024/07/30 18:52:26 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.584 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -4669,7 +4669,7 @@ decide_to_shapeshift(struct monst *mon)
boolean dochng = FALSE; boolean dochng = FALSE;
if (!is_vampshifter(mon)) { if (!is_vampshifter(mon)) {
/* regular shapeshifter */ /* regular shapeshifter; 'ptr' is Null */
if (!rn2(6)) if (!rn2(6))
dochng = TRUE; dochng = TRUE;
} else if (!(mon->mstrategy & STRAT_WAITFORU)) { } else if (!(mon->mstrategy & STRAT_WAITFORU)) {
@@ -4715,20 +4715,7 @@ decide_to_shapeshift(struct monst *mon)
} }
} }
if (dochng) { if (dochng) {
unsigned ncflags = (is_vampshifter(mon) || canspotmon(mon)) if (newcham(mon, ptr, NC_SHOW_MSG)) {
? NC_SHOW_MSG : 0U;
if (!ncflags) {
/* cheat */
struct permonst *oldptr = mon->data;
mon->data = ptr;
if (canspotmon(mon))
ncflags = NC_SHOW_MSG;
mon->data = oldptr;
}
if (newcham(mon, ptr, ncflags)) {
/* for vampshift, override the 10% chance for sex change /* for vampshift, override the 10% chance for sex change
(by forcing original gender in case that occurred) */ (by forcing original gender in case that occurred) */
if (is_vampshifter(mon)) { if (is_vampshifter(mon)) {