Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-11-16 23:14:34 -05:00
19 changed files with 38 additions and 41 deletions
+1 -1
View File
@@ -1176,7 +1176,7 @@ menu_display_page(nhmenu *menu, WINDOW * win, int page_num, char *selectors)
if (menu_item_ptr->glyph != NO_GLYPH && iflags.use_menu_glyphs) {
unsigned special; /*notused */
mapglyph(menu_item_ptr->glyph, &curletter, &color, &special, 0, 0);
mapglyph(menu_item_ptr->glyph, &curletter, &color, &special, 0, 0, 0);
curses_toggle_color_attr(win, color, NONE, ON);
mvwaddch(win, menu_item_ptr->line_num + 1, start_col, curletter);
curses_toggle_color_attr(win, color, NONE, OFF);
+1 -1
View File
@@ -125,7 +125,7 @@ curses_add_inv(int y,
int symbol = 0;
attr_t glyphclr;
mapglyph(glyph, &symbol, &color, &dummy, u.ux, u.uy);
mapglyph(glyph, &symbol, &color, &dummy, u.ux, u.uy, 0);
glyphclr = curses_color_attr(color, 0);
wattron(win, glyphclr);
wprintw(win, "%c ", symbol);
+1 -1
View File
@@ -665,7 +665,7 @@ curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph,
int attr = -1;
/* map glyph to character and color */
mapglyph(glyph, &ch, &color, &special, x, y);
mapglyph(glyph, &ch, &color, &special, x, y, 0);
if ((special & MG_PET) && iflags.hilite_pet) {
attr = iflags.wc2_petattr;
}