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

fix #H9298 - corpse mismatch

Browse Source 
Corpses for dying monsters were being created with the wrong type,
caused by incorrect block nesting for 'if (ptr)' from commit
ad302fb8a9 (Oct 10).
This commit is contained in:
PatR
2019-10-12 02:31:47 -07:00
parent 6cbf10d974
commit 1fc8d7528c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mkobj.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mkobj.c $NHDT-Date: 1570754586 2019/10/11 00:43:06 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.154 $ */
/* NetHack 3.6 mkobj.c $NHDT-Date: 1570872702 2019/10/12 09:31:42 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.155 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1540,18 +1540,20 @@ unsigned corpstatflags;
otmp = mksobj_at(objtype, x, y, init, FALSE);
}
/* when 'mtmp' is non-null make a corpse or statue of that monster,
otherwise keep the random type chosen by mksobj() */
/* when 'mtmp' is non-null save the monster's details with the
corpse or statue; it will also force the 'ptr' override below */
if (mtmp) {
int old_corpsenm = otmp->corpsenm;
/* save_mtraits updates otmp->oextra->omonst in place */
(void) save_mtraits(otmp, mtmp);
/* when 'ptr' is non-null use the type specified by our caller,
otherwise use the monster's species for the corpse */
if (!ptr)
ptr = mtmp->data;
}
/* when 'ptr' is non-null it comes from our caller or from 'mtmp';
override mkobjs()'s initialization of a random monster type */
if (ptr) {
int old_corpsenm = otmp->corpsenm;
otmp->corpsenm = monsndx(ptr);
otmp->owt = weight(otmp);