Remove gendered mons indices from roles, races

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

View File

@@ -175,8 +175,7 @@ struct Role {
const char *intermed; /* quest intermediate goal (from questpgr.c) */
/*** Indices of important monsters and objects ***/
short malenum, /* index (PM_) as a male (botl.c) */
femalenum, /* ...or as a female (NON_PM == same) */
short mnum, /* index (PM_) of role (botl.c) */
petnum, /* PM_ of preferred pet (NON_PM == random) */
ldrnum, /* PM_ of quest leader (questpgr.c) */
guardnum, /* PM_ of quest guardians (questpgr.c) */
@@ -230,8 +229,8 @@ struct Role {
};
extern const struct Role roles[]; /* table of available roles */
#define Role_if(X) (g.urole.malenum == (X))
#define Role_switch (g.urole.malenum)
#define Role_if(X) (g.urole.mnum == (X))
#define Role_switch (g.urole.mnum)
/* used during initialization for race, gender, and alignment
as well as for character class */
@@ -249,8 +248,7 @@ struct Race {
struct RoleName individual; /* individual as a noun ("man", "elf") */
/*** Indices of important monsters and objects ***/
short malenum, /* PM_ as a male monster */
femalenum, /* ...or as a female (NON_PM == same) */
short mnum, /* PM_ as a monster */
mummynum, /* PM_ as a mummy */
zombienum; /* PM_ as a zombie */
@@ -281,8 +279,8 @@ struct Race {
};
extern const struct Race races[]; /* Table of available races */
#define Race_if(X) (g.urace.malenum == (X))
#define Race_switch (g.urace.malenum)
#define Race_if(X) (g.urace.mnum == (X))
#define Race_switch (g.urace.mnum)
/*** Unified structure specifying gender information ***/
struct Gender {