Merge branch 'NetHack-3.6.2'

2019-03-13 20:21:56 -04:00
parent fa186b49a1 6a2f843366
commit fc9dde7ae1
13 changed files with 51 additions and 33 deletions
@@ -358,8 +358,7 @@ putstr(window, attr, str)
                -- Print str on the window with the given attribute.  Only
                   printable ASCII characters (040-0126) must be supported.
                   Multiple putstr()s are output on separate lines.
-Attributes
-                   can be one of
+                   Attributes can be one of
                        ATR_NONE (or 0)
                        ATR_ULINE
                        ATR_BOLD
@@ -616,7 +615,10 @@ curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph,
        } else
 */
        if ((special & MG_OBJPILE) && iflags.hilite_pile) {
-            color = 16 + (color * 2) + 1;
+            if (iflags.wc_color)
+                color = 16 + (color * 2) + 1;
+            else
+                attr = A_REVERSE;
        }
    }