nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

remove mapglyph() remnants from win/curses/

Browse Source 
Remove a couple of leftover references to mapglyph() from the
curses code (present inside '#if 0' blocks).  I've tried to
substitute code which should work but have no idea whether it
actually will.
This commit is contained in:
PatR
2021-01-02 10:46:17 -08:00
parent 9bd992f4a5
commit b815c470ec
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/curses/cursdial.c
+4 -3
View File
@@ -1180,10 +1180,11 @@ menu_display_page(nhmenu *menu, WINDOW * win, int page_num, char *selectors)
#if 0 #if 0
/* FIXME: menuglyphs not implemented yet */ /* FIXME: menuglyphs not implemented yet */
if (menu_item_ptr->glyph != NO_GLYPH && iflags.use_menu_glyphs) { if (menu_item_ptr->glyph != NO_GLYPH && iflags.use_menu_glyphs) {
unsigned special; /*notused */ unsigned glyphmod[NUM_GLYPHMOD];
map_glyphmod(0, 0, menu_item_ptr->glyph, 0U, glyphmod);
color = (int) glyphmod[GM_COLOR];
/*mapglyph(menu_item_ptr->glyph, &curletter, &color, &special,
0, 0, 0);*/
curses_toggle_color_attr(win, color, NONE, ON); curses_toggle_color_attr(win, color, NONE, ON);
mvwaddch(win, menu_item_ptr->line_num + 1, start_col, curletter); mvwaddch(win, menu_item_ptr->line_num + 1, start_col, curletter);
curses_toggle_color_attr(win, color, NONE, OFF); curses_toggle_color_attr(win, color, NONE, OFF);
win/curses/cursinvt.c
+6 -4
View File
@@ -120,12 +120,14 @@ curses_add_inv(int y,
} }
#if 0 /* FIXME: MENU GLYPHS */ #if 0 /* FIXME: MENU GLYPHS */
if (accelerator && glyph != NO_GLYPH && iflags.use_menu_glyphs) { if (accelerator && glyph != NO_GLYPH && iflags.use_menu_glyphs) {
unsigned dummy = 0; /* Not used */ unsigned glyphmod[NUM_GLYPHMOD];
int color = 0; int symbol;
int symbol = 0;
attr_t glyphclr; attr_t glyphclr;
/* mapglyph(glyph, &symbol, &color, &dummy, u.ux, u.uy, 0); */ map_glyphmod(0, 0, glyph, 0U, glyphmod);
symbol = (int) glyphmod[GM_TTYCHAR];
color = (int) glyphmod[GM_COLOR];
glyphclr = curses_color_attr(color, 0); glyphclr = curses_color_attr(color, 0);
wattron(win, glyphclr); wattron(win, glyphclr);
wprintw(win, "%c ", symbol); wprintw(win, "%c ", symbol);