Remove lingering traces of hilite_hidden_stairs

This was removed as an option some time ago, but there were still a
couple bits of code sticking around involving that system.

As part of this, MG_PEACEFUL is shifted back one bit (tested it,
peacefuls are still highlighted appropriately, no changes).

Also, I noticed a comment in map_glyphinfo was somewhat out of date, so
I updated it to reflect what it currently does and doesn't cover.

Author: copperwater

include/display.h

@@ -1114,8 +1114,7 @@ enum glyph_offsets {
 #define MG_FEMALE  0x02000  /* represents a female mon or statue of one */
 #define MG_BADXY   0x04000  /* bad coordinates were passed */
 /* xNetHack added ones start here */
-#define MG_STAIRS  0x08000  /* hidden stairs */
-#define MG_PEACEFUL 0x10000 /* peaceful monster */
+#define MG_PEACEFUL 0x08000 /* peaceful monster */
 
 /* docrt(): re-draw whole screen; docrt_flags(): docrt() with more control */
 enum docrt_flags_bits {

src/display.c

@@ -2686,13 +2686,14 @@ map_glyphinfo(
     /* NetHack 3.7 commit 1f6c1d0 instated a system in which variants of a
      * single S_foo defsym that should render as different colors in text
      * windowports now need to be their own glyphs, optionally allowing each
-     * glyph to be its own tile. (This is how altars are now treated.)
-     * xNetHack has additional color variants of a single defsym (iron doors and
-     * most notably object materials) which were not covered by this change, so
-     * for the time being the on-the-fly color computations have been re-added
-     * here. Likely the ones for object materials will be permanent, since
-     * adding glyphs and tiles for every material variant of every object would
-     * be an enormous amount of work. */
+     * glyph to be its own tile. (This is how altars are now treated, and in
+     * xNetHack magic platforms and engravings also use that method.)
+     * xNetHack has additional color variants of a single defsym (most notably
+     * object materials, but also colored walls and floors) which were not
+     * covered by this change, so for the time being, the on-the-fly color
+     * computations have been re-added here. Likely the ones for object
+     * materials will be permanent, since adding glyphs and tiles for every
+     * material variant of every object would be an enormous amount of work. */
     /* isok is used because this is sometimes called with 0,0 */
     if (iflags.use_color && isok(x, y)) {
         /* object or statue, which might be made of a non-default material or on
@@ -2703,8 +2704,6 @@ map_glyphinfo(
             if (otmp) {
                 if (otmp && otmp->material != objects[otmp->otyp].oc_material)
                     glyphinfo->gm.sym.color = materialclr[otmp->material];
-                if (On_stairs(x,y))
-                    glyphinfo->gm.glyphflags |= MG_STAIRS;
             }
             /* !otmp is not actually impossible, because this is called from
              * tmp_at(), in which an object is flying through the air above

win/curses/cursmain.c

@@ -976,11 +976,6 @@ curses_print_glyph(
         ch = curses_convert_glyph(ch, glyph);
 
     if (wid == NHW_MAP) {
-/* hilite stairs not in 3.6, yet
-        if ((special & MG_STAIRS) && iflags.hilite_hidden_stairs) {
-            color = 16 + (color * 2);
-        } else
-*/
         if ((special & MG_OBJPILE) && iflags.hilite_pile) {
             if (iflags.wc_color)
                 color = get_framecolor(color, CLR_BLUE);
@@ -1006,7 +1001,7 @@ curses_print_glyph(
 #ifdef ENHANCED_SYMBOLS
                  (SYMHANDLING(H_UTF8)
                   && glyphinfo->gm.u && glyphinfo->gm.u->utf8str)
-                      ? glyphinfo->gm.u : NULL, 
+                      ? glyphinfo->gm.u : NULL,
 #endif
                  (nhcolor != 0) ? nhcolor : color,
                  bkglyphinfo->framecolor, attr);