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.

src/role.c

@@ -41,7 +41,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Tomb of the Toltec Kings",
       PM_ARCHEOLOGIST,
       NON_PM,
-      NON_PM,
       PM_LORD_CARNARVON,
       PM_STUDENT,
       PM_MINION_OF_HUHETOTL,
@@ -83,7 +82,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Duali Oasis",
       PM_BARBARIAN,
       NON_PM,
-      NON_PM,
       PM_PELIAS,
       PM_CHIEFTAIN,
       PM_THOTH_AMON,
@@ -124,7 +122,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Caves of the Ancestors",
       "the Dragon's Lair",
       PM_CAVE_DWELLER,
-      NON_PM,
       PM_LITTLE_DOG,
       PM_SHAMAN_KARNOV,
       PM_NEANDERTHAL,
@@ -167,7 +164,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Temple of Coeus",
       PM_HEALER,
       NON_PM,
-      NON_PM,
       PM_HIPPOCRATES,
       PM_ATTENDANT,
       PM_CYCLOPS,
@@ -207,7 +203,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "Camelot Castle",
       "the Isle of Glass",
       PM_KNIGHT,
-      NON_PM,
       PM_PONY,
       PM_KING_ARTHUR,
       PM_PAGE,
@@ -249,7 +244,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Monastery of the Earth-Lord",
       PM_MONK,
       NON_PM,
-      NON_PM,
       PM_GRAND_MASTER,
       PM_ABBOT,
       PM_MASTER_KAEN,
@@ -291,7 +285,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Temple of Nalzok",
       PM_CLERIC,
       NON_PM,
-      NON_PM,
       PM_ARCH_PRIEST,
       PM_ACOLYTE,
       PM_NALZOK,
@@ -335,7 +328,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Assassins' Guild Hall",
       PM_ROGUE,
       NON_PM,
-      NON_PM,
       PM_MASTER_OF_THIEVES,
       PM_THUG,
       PM_MASTER_ASSASSIN,
@@ -389,7 +381,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "Orion's camp",
       "the cave of the wumpus",
       PM_RANGER,
-      NON_PM,
       PM_LITTLE_DOG /* Orion & canis major */,
       PM_ORION,
       PM_HUNTER,
@@ -431,7 +422,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Castle of the Taro Clan",
       "the Shogun's Castle",
       PM_SAMURAI,
-      NON_PM,
       PM_LITTLE_DOG,
       PM_LORD_SATO,
       PM_ROSHI,
@@ -473,7 +463,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Thieves' Guild Hall",
       PM_TOURIST,
       NON_PM,
-      NON_PM,
       PM_TWOFLOWER,
       PM_GUIDE,
       PM_MASTER_OF_THIEVES,
@@ -513,7 +502,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Shrine of Destiny",
       "the cave of Surtur",
       PM_VALKYRIE,
-      NON_PM,
       NON_PM /*PM_WINTER_WOLF_CUB*/,
       PM_NORN,
       PM_WARRIOR,
@@ -554,7 +542,6 @@ const struct Role roles[NUM_ROLES+1] = {
       "the Lonely Tower",
       "the Tower of Darkness",
       PM_WIZARD,
-      NON_PM,
       PM_KITTEN,
       PM_NEFERET_THE_GREEN,
       PM_APPRENTICE,
@@ -594,7 +581,6 @@ const struct Race races[] = {
         "Hum",
         { "man", "woman" },
         PM_HUMAN,
-        NON_PM,
         PM_HUMAN_MUMMY,
         PM_HUMAN_ZOMBIE,
         MH_HUMAN | ROLE_MALE | ROLE_FEMALE | ROLE_LAWFUL | ROLE_NEUTRAL
@@ -616,7 +602,6 @@ const struct Race races[] = {
         "Elf",
         { 0, 0 },
         PM_ELF,
-        NON_PM,
         PM_ELF_MUMMY,
         PM_ELF_ZOMBIE,
         MH_ELF | ROLE_MALE | ROLE_FEMALE | ROLE_CHAOTIC,
@@ -637,7 +622,6 @@ const struct Race races[] = {
         "Dwa",
         { 0, 0 },
         PM_DWARF,
-        NON_PM,
         PM_DWARF_MUMMY,
         PM_DWARF_ZOMBIE,
         MH_DWARF | ROLE_MALE | ROLE_FEMALE | ROLE_LAWFUL,
@@ -658,7 +642,6 @@ const struct Race races[] = {
         "Gno",
         { 0, 0 },
         PM_GNOME,
-        NON_PM,
         PM_GNOME_MUMMY,
         PM_GNOME_ZOMBIE,
         MH_GNOME | ROLE_MALE | ROLE_FEMALE | ROLE_NEUTRAL,
@@ -679,7 +662,6 @@ const struct Race races[] = {
         "Orc",
         { 0, 0 },
         PM_ORC,
-        NON_PM,
         PM_ORC_MUMMY,
         PM_ORC_ZOMBIE,
         MH_ORC | ROLE_MALE | ROLE_FEMALE | ROLE_CHAOTIC,
@@ -2034,7 +2016,7 @@ role_init(void)
  * needed--via instrinsic 'Infravision' which set_uasmon() manages.
  */
     /* Fix up infravision */
-    if (mons[g.urace.malenum].mflags3 & M3_INFRAVISION) {
+    if (mons[g.urace.mnum].mflags3 & M3_INFRAVISION) {
         /* although an infravision intrinsic is possible, infravision
          * is purely a property of the physical race.  This means that we
          * must put the infravision flag in the player's current race
@@ -2044,9 +2026,7 @@ role_init(void)
          * but since infravision has no effect for NPCs anyway we can
          * ignore this.
          */
-        mons[g.urole.malenum].mflags3 |= M3_INFRAVISION;
-        if (g.urole.femalenum != NON_PM)
-            mons[g.urole.femalenum].mflags3 |= M3_INFRAVISION;
+        mons[g.urole.mnum].mflags3 |= M3_INFRAVISION;
     }
 #endif /*0*/