Merge branch 'NetHack-3.6'

win/curses/cursmain.c

@@ -29,7 +29,8 @@ extern long curs_mesg_suppress_turn; /* from cursmesg.c */
 /* Interface definition, for windows.c */
 struct window_procs curses_procs = {
     "curses",
-    (WC_ALIGN_MESSAGE | WC_ALIGN_STATUS | WC_COLOR | WC_HILITE_PET
+    (WC_ALIGN_MESSAGE | WC_ALIGN_STATUS | WC_COLOR | WC_INVERSE
+     | WC_HILITE_PET
 #ifdef NCURSES_MOUSE_VERSION /* (this macro name works for PDCURSES too) */
      | WC_MOUSE_SUPPORT
 #endif
@@ -658,9 +659,9 @@ curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph,
     if ((special & MG_DETECT) && iflags.use_inverse) {
         attr = A_REVERSE;
     }
-    if (!g.symset[PRIMARY].name || !strcmpi(g.symset[PRIMARY].name, "curses")) {
+    if (SYMHANDLING(H_DEC))
         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) {
@@ -673,6 +674,11 @@ curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph,
             else
                 attr = A_REVERSE;
         }
+        /* water and lava look the same except for color; when color is off,
+           render lava in inverse video so that they look different */
+        if ((special & MG_BW_LAVA) && iflags.use_inverse) {
+            attr = A_REVERSE; /* mapglyph() only sets this if color is off */
+        }
     }
 
     curses_putch(wid, x, y, ch, color, attr);