Merge branch 'NetHack-3.6'

src/mapglyph.c

@@ -245,16 +245,11 @@ unsigned mgflags;
 #ifdef TEXTCOLOR
     /* Turn off color if no color defined, or rogue level w/o PC graphics. */
     if (!has_color(color) || (Is_rogue_level(&u.uz) && !has_rogue_color))
-        color = NO_COLOR;
 #endif
-
+        color = NO_COLOR;
     *ochar = (int) ch;
     *ospecial = special;
-#ifdef TEXTCOLOR
     *ocolor = color;
-#else
-    nhUse(ocolor);
-#endif
     return idx;
 }