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

fix github issue #589 - gremlin crash

Browse Source 
when fleeing hero who was wearing gold dragon scales/mail and not
wielding any weapon.

When a gremlin was made to flee "artifact light", code originally
intended for Sunsword attempted to format 'uwep' as an artifact.  For
gold scales/mail instead of that, it gave a sane but inappropriate
value if wielding something or segfaulted if not wielding anything.

Fixes #589
This commit is contained in:
PatR
2021-09-11 03:04:04 -07:00
parent dc3f1447c7
commit d118ac52af
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes37.0
+1
View File
@@ -802,6 +802,7 @@ if an invisible monster put on or took off armor while out of hero's sight
spurious message "Suddenly you cannot see it" would be given spurious message "Suddenly you cannot see it" would be given
an item thrown or dropped while swallowed was treated as being picked up by an an item thrown or dropped while swallowed was treated as being picked up by an
unseen monster so object fields {known, dknown, bknown} got cleared unseen monster so object fields {known, dknown, bknown} got cleared
segfault if gremlin fled weaponless hero wearing gold dragon scales/mail
curses: 'msg_window' option wasn't functional for curses unless the binary curses: 'msg_window' option wasn't functional for curses unless the binary
also included tty support also included tty support
src/monmove.c
+27 -10
View File
@@ -298,13 +298,15 @@ bee_eat_jelly(struct monst* mon, struct obj* obj)
return -1; /* a queen is already present; ordinary bee hasn't moved yet */ return -1; /* a queen is already present; ordinary bee hasn't moved yet */
} }
/* FIXME: gremlins don't flee from monsters wielding Sunsword or wearing
gold dragon scales/mail, nor from gold dragons, only from the hero */
#define flees_light(mon) \ #define flees_light(mon) \
((mon)->data == &mons[PM_GREMLIN] \ ((mon)->data == &mons[PM_GREMLIN] \
&& ((uwep && uwep->lamplit && artifact_light(uwep)) \ && ((uwep && uwep->lamplit && artifact_light(uwep)) \
|| (uarm && uarm->lamplit && artifact_light(uarm)))) || (uarm && uarm->lamplit && artifact_light(uarm))) \
/* we could include this in the above macro, but probably overkill/overhead */ /* not applicable if mon can't see or hero isn't in line of sight */ \
/* && (!(which_armor((mon), W_ARMC) != 0 */ && mon->mcansee && couldsee(mon->mx, mon->my)) \
/* && which_armor((mon), W_ARMH) != 0)) */ /* doesn't matter if hero is invisible--light being emitted isn't */
/* monster begins fleeing for the specified time, 0 means untimed flee /* monster begins fleeing for the specified time, 0 means untimed flee
* if first, only adds fleetime if monster isn't already fleeing * if first, only adds fleetime if monster isn't already fleeing
@@ -343,13 +345,28 @@ monflee(
if (!mtmp->mcanmove || !mtmp->data->mmove) { if (!mtmp->mcanmove || !mtmp->data->mmove) {
pline("%s seems to flinch.", Adjmonnam(mtmp, "immobile")); pline("%s seems to flinch.", Adjmonnam(mtmp, "immobile"));
} else if (flees_light(mtmp)) { } else if (flees_light(mtmp)) {
if (rn2(10) || Deaf) if (Unaware) {
/* tell the player even if the hero is unconscious */
pline("%s is frightened.", Monnam(mtmp));
} else if (rn2(10) || Deaf) {
/* via flees_light(), will always be either via uwep
(Sunsword) or uarm (gold dragon scales/mail) or both;
TODO? check for both and describe the one which is
emitting light with a bigger radius */
const char *lsrc = (uwep && artifact_light(uwep))
? bare_artifactname(uwep)
: (uarm && artifact_light(uarm))
? yname(uarm)
: "[its imagination?]";
pline("%s flees from the painful light of %s.", pline("%s flees from the painful light of %s.",
Monnam(mtmp), bare_artifactname(uwep)); Monnam(mtmp), lsrc);
else } else {
verbalize("Bright light!"); verbalize("Bright light!");
} else }
} else {
pline("%s turns to flee.", Monnam(mtmp)); pline("%s turns to flee.", Monnam(mtmp));
}
} }
mtmp->mflee = 1; mtmp->mflee = 1;
} }