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

fix obj_pmname() fix

Browse Source 
The omonst 'data' pointer is always Null so taking mons[].pmname from
saved traits would be skipped all the time.
This commit is contained in:
PatR
2021-06-15 14:13:55 -07:00
parent fe4822829c
commit 7088f6a846
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/do_name.c
+8 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 do_name.c $NHDT-Date: 1622363509 2021/05/30 08:31:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.202 $ */ /* NetHack 3.7 do_name.c $NHDT-Date: 1623791632 2021/06/15 21:13:52 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.206 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2098,8 +2098,13 @@ mon_pmname(struct monst *mon)
const char * const char *
obj_pmname(struct obj *obj) obj_pmname(struct obj *obj)
{ {
if (has_omonst(obj) && OMONST(obj)->data) if (has_omonst(obj)) {
return mon_pmname(OMONST(obj)); struct monst *m = OMONST(obj);
/* obj->oextra->omonst->data is Null but ...->mnum is set */
if (m->mnum >= LOW_PM)
return pmname(&mons[m->mnum], m->female ? FEMALE : MALE);
}
if ((obj->otyp == CORPSE || obj->otyp == STATUE || obj->otyp == FIGURINE) if ((obj->otyp == CORPSE || obj->otyp == STATUE || obj->otyp == FIGURINE)
&& obj->corpsenm >= LOW_PM) { && obj->corpsenm >= LOW_PM) {