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

simplify a couple of monster naming bits

Browse Source
This commit is contained in:
PatR
2024-04-18 12:34:03 -07:00
parent 14c1cafdf8
commit ea8ebea2d3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/do_name.c
View File

@@ -896,11 +896,10 @@ x_monnam(
return strcpy(buf, name); return strcpy(buf, name);
} }
/* 'pm_name' is the base part of the name */ /* 'pm_name' is the base part of most names */
if (do_mappear) { if (do_mappear) {
assert(ismnum(mtmp->mappearance)); assert(ismnum(mtmp->mappearance));
pm_name = pmname(&mons[mtmp->mappearance], pm_name = pmname(&mons[mtmp->mappearance], Mgender(mtmp));
mtmp->female ? FEMALE : MALE);
} else { } else {
pm_name = mon_pmname(mtmp); pm_name = mon_pmname(mtmp);
} }
@@ -1289,7 +1288,7 @@ const char *
mon_pmname(struct monst *mon) mon_pmname(struct monst *mon)
{ {
/* for neuter, mon->data->pmnames[MALE] will be Null and use [NEUTRAL] */ /* for neuter, mon->data->pmnames[MALE] will be Null and use [NEUTRAL] */
return pmname(mon->data, mon->female ? FEMALE : MALE); return pmname(mon->data, Mgender(mon));
} }
/* mons[]->pmname for a corpse or statue or figurine */ /* mons[]->pmname for a corpse or statue or figurine */
@@ -1305,7 +1304,7 @@ obj_pmname(struct obj *obj)
/* obj->oextra->omonst->data is Null but ...->mnum is set */ /* obj->oextra->omonst->data is Null but ...->mnum is set */
if (ismnum(m->mnum)) if (ismnum(m->mnum))
return pmname(&mons[m->mnum], m->female ? FEMALE : MALE); return pmname(&mons[m->mnum], Mgender(m));
} }
#endif #endif
if ((obj->otyp == CORPSE || obj->otyp == STATUE || obj->otyp == FIGURINE) if ((obj->otyp == CORPSE || obj->otyp == STATUE || obj->otyp == FIGURINE)