incorporate some pmnames feedback

Also an update to a fixes37.0 entry

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index d86b9d5ec0dc751b457db28ea5d1745141128d4c..0e71110530e8cc353026f8e10689c84fb271fde0 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -738,8 +738,7 @@ Qt: add Filter, Layout, and Reset buttons to the extended command selector;
        to their default settings and clears any pending typed input
 tiles: male and female variations in monsters.txt; tested only with tile2bmp
        conversion utility so far; also supported by tilemap utility to
-       generate tile.c; some window-port modifications still required to
-       integrate the male and female tile capability into the window port
+       generate tile.c
 Unix: can define NOSUSPEND in config.h or src/Makefile's CFLAGS to prevent
        unixconf.h from enabling SUSPEND without need to modify unixconf.h
 
@@ -838,4 +837,5 @@ replace the single permonst mname field with male, female, and gender-neutral
        names pmnames[NUM_MGENDERS] fields
 add a new glyphmod parameter to window interface *_print_glyph() to be used
        to provide additional details to the window port beyond the glyph;
-       begin to phase out the mapglyph() calls from within windows ports
+       begin to phase out the mapglyph() calls from within windows ports;
+

diff --git a/src/makemon.c b/src/makemon.c
index 27f9ad04977cae95056492e1377c3cffcaebb822..0199cedb4fed09dbfeca32b9c84d5648fb79d9e3 100644 (file)
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -247,7 +247,7 @@ register struct monst *mtmp;
                 }
                 break;
             }
-            if (mm == PM_ELVENMONARCH) {
+            if (mm == PM_ELVEN_MONARCH) {
                 if (rn2(3) || (g.in_mklev && Is_earthlevel(&u.uz)))
                     (void) mongets(mtmp, PICK_AXE);
                 if (!rn2(50))

diff --git a/src/mkroom.c b/src/mkroom.c
index 405efb312dd13b377a791345a9439b990b839f09..496b4c42654976e695cb96b2f34dd2a57d7eeb27 100644 (file)
--- a/src/mkroom.c
+++ b/src/mkroom.c
@@ -251,7 +251,7 @@ int x,y;
 {
     int i = rnd(level_difficulty());
     int pm = (i > 9) ? PM_OGRE_TYRANT
-        : (i > 5) ? PM_ELVENMONARCH
+        : (i > 5) ? PM_ELVEN_MONARCH
         : (i > 2) ? PM_DWARF_RULER
         : PM_GNOME_RULER;
     struct monst *mon = makemon(&mons[pm], x, y, NO_MM_FLAGS);

diff --git a/src/mondata.c b/src/mondata.c
index e78806dbe875e29570549d93a8e4e9993a0f6cd5..142d44c2baf124da9716adde3449146247c59243 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -772,7 +772,7 @@ int *gender_name_var;
             { "master of assassin", PM_MASTER_ASSASSIN, NEUTRAL },
             /* Outdated names */
             { "invisible stalker", PM_STALKER, NEUTRAL },
-            { "high-elf", PM_ELVENMONARCH, NEUTRAL }, /* PM_HIGH_ELF is obsolete */
+            { "high-elf", PM_ELVEN_MONARCH, NEUTRAL }, /* PM_HIGH_ELF is obsolete */
             /* other misspellings or incorrect words */
             { "wood-elf", PM_WOODLAND_ELF, NEUTRAL },
             { "wood elf", PM_WOODLAND_ELF, NEUTRAL },
@@ -1051,7 +1051,7 @@ static const short grownups[][2] = {
     { PM_WOODLAND_ELF, PM_ELF_NOBLE },
     { PM_GREEN_ELF, PM_ELF_NOBLE },
     { PM_GREY_ELF, PM_ELF_NOBLE },
-    { PM_ELF_NOBLE, PM_ELVENMONARCH },
+    { PM_ELF_NOBLE, PM_ELVEN_MONARCH },
     { PM_LICH, PM_DEMILICH },
     { PM_DEMILICH, PM_MASTER_LICH },
     { PM_MASTER_LICH, PM_ARCH_LICH },

diff --git a/src/monst.c b/src/monst.c
index 2e44b5413e5837eee5ccac9077daec2c5f60ff23..ac2700d6f389bc330b4b79c4873e9932ad22e9c7 100644 (file)
--- a/src/monst.c
+++ b/src/monst.c
@@ -1692,7 +1692,7 @@ struct permonst _mons2[] = {
         SIZ(1600, 500, MS_GRUNT, MZ_LARGE), 0, 0, M1_HUMANOID | M1_CARNIVORE,
         M2_STRONG | M2_GREEDY | M2_JEWELS | M2_COLLECT,
         M3_INFRAVISIBLE | M3_INFRAVISION, 7, CLR_BROWN),
-    MON3("ogre lord", "ogre conqueress", "ogre leader",
+    MON3("ogre lord", "ogre lady", "ogre leader",
         S_OGRE, LVL(7, 12, 3, 30, -5), (G_GENO | 2),
         A(ATTK(AT_WEAP, AD_PHYS, 2, 6), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK,
           NO_ATTK),
@@ -2209,7 +2209,7 @@ struct permonst _mons2[] = {
         M1_HUMANOID | M1_OMNIVORE | M1_SEE_INVIS,
         M2_ELF | M2_STRONG | M2_LORD | M2_COLLECT,
         M3_INFRAVISIBLE | M3_INFRAVISION, 11, CLR_BRIGHT_BLUE),
-    MON3("Elvenking", "Elvenqueen", "Elvenmonarch",
+    MON3("Elvenking", "Elvenqueen", "elven monarch",
         S_HUMAN, LVL(9, 12, 10, 25, -10), (G_GENO | 1),
         A(ATTK(AT_WEAP, AD_PHYS, 2, 4), ATTK(AT_WEAP, AD_PHYS, 2, 4),
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
@@ -2411,7 +2411,7 @@ struct permonst _mons2[] = {
     A(ATTK(AT_CLAW, AD_PHYS, 1, 3), ATTK(AT_CLAW, AD_PHYS, 1, 3), \
       ATTK(AT_BITE, AD_DRLI, 2, 6), NO_ATTK, NO_ATTK, NO_ATTK)
     /* incubus and succubus */
-    MON3("incubus", "succubus", "Amorous Demon",
+    MON3("incubus", "succubus", "amorous demon",
         S_DEMON, LVL(6, 12, 0, 70, -9), (G_NOCORPSE | 1),
         SEDUCTION_ATTACKS_YES, SIZ(WT_HUMAN, 400, MS_SEDUCE, MZ_HUMAN),
         MR_FIRE | MR_POISON, 0, M1_HUMANOID | M1_FLY | M1_POIS,

diff --git a/src/wizard.c b/src/wizard.c
index a4e9d07f15336b9fd7263ecdcef34bf2a1b2b76d..4f1891566481898f8f0e29598b1c088b279b3222 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -37,7 +37,7 @@ static NEARDATA const int nasties[] = {
     /* chaotic */
     PM_BLACK_DRAGON, PM_RED_DRAGON, PM_ARCH_LICH, PM_VAMPIRE_LEADER,
     PM_MASTER_MIND_FLAYER, PM_DISENCHANTER, PM_WINGED_GARGOYLE,
-    PM_STORM_GIANT, PM_OLOG_HAI, PM_ELF_NOBLE, PM_ELVENMONARCH,
+    PM_STORM_GIANT, PM_OLOG_HAI, PM_ELF_NOBLE, PM_ELVEN_MONARCH,
     PM_OGRE_TYRANT, PM_CAPTAIN, PM_GREMLIN,
     /* lawful */
     PM_SILVER_DRAGON, PM_ORANGE_DRAGON, PM_GREEN_DRAGON,

diff --git a/win/share/monsters.txt b/win/share/monsters.txt
index e14f4611fec07820dd2a5898b43cb4380a7bef13..200efe5fd091572e3035f1d05af88acc182a4304 100644 (file)
--- a/win/share/monsters.txt
+++ b/win/share/monsters.txt
@@ -10401,7 +10401,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 546 (Elvenmonarch,male)
+# tile 546 (elven monarch,male)
 {
   ................
   ................
@@ -10420,7 +10420,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 547 (Elvenmonarch,female)
+# tile 547 (elven monarch,female)
 {
   ................
   ................