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

Remove gendered mons indices from roles, races

Browse Source 
There are no longer distinct gendered versions of monsters, so femalenum
is unused (i.e. set to NON_PM) for all roles and races. Take a pass at
removing all uses of/references to femalenum, and rename 'malenum' to
'mnum' since it no longer has any particular association with
gender or sex.
This commit is contained in:
Michael Meyer
2022-01-12 16:56:13 -05:00
committed by PatR
parent c954c267c0
commit f5e3bc3d96
16 changed files with 56 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/u_init.c
View File

@@ -654,9 +654,7 @@ u_init(void)
u.umortality = 0;
u.ugrave_arise = NON_PM;
u.umonnum = u.umonster = (flags.female && g.urole.femalenum != NON_PM)
? g.urole.femalenum
: g.urole.malenum;
u.umonnum = u.umonster = g.urole.mnum;
u.ulycn = NON_PM;
set_uasmon();
@@ -1080,13 +1078,13 @@ ini_inv(struct trobj *trop)
g.nocreate4 = otyp;
}
if (g.urace.malenum != PM_HUMAN) {
if (g.urace.mnum != PM_HUMAN) {
/* substitute race-specific items; this used to be in
the 'if (otyp != UNDEF_TYP) { }' block above, but then
substitutions didn't occur for randomly generated items
(particularly food) which have racial substitutes */
for (i = 0; inv_subs[i].race_pm != NON_PM; ++i)
if (inv_subs[i].race_pm == g.urace.malenum
if (inv_subs[i].race_pm == g.urace.mnum
&& otyp == inv_subs[i].item_otyp) {
debugpline3("ini_inv: substituting %s for %s%s",
OBJ_NAME(objects[inv_subs[i].subs_otyp]),