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

adjust some disabled code in curses window port

Browse Source
This commit is contained in:
nhmall
2021-01-05 16:06:58 -05:00
parent b0a366d0ae
commit c6306e1117
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
win/curses/cursdial.c
View File

@@ -621,8 +621,7 @@ curses_add_nhmenu_item(winid wid, const glyph_info *glyphinfo,
}
new_item = curs_new_menu_item(wid, str);
if (glyphinfo)
new_item->glyphinfo = *glyphinfo;
new_item->glyphinfo = *glyphinfo;
new_item->identifier = *identifier;
new_item->accelerator = accelerator;
new_item->group_accel = group_accel;
@@ -1039,7 +1038,8 @@ menu_win_size(nhmenu *menu)
/* Add space for accelerator (selector letter) */
curentrywidth += 4;
#if 0 /* FIXME: menu glyphs */
if (menu_item_ptr->glyph != NO_GLYPH && iflags.use_menu_glyphs)
if (menu_item_ptr->glyphinfo.glyph != NO_GLYPH
&& iflags.use_menu_glyphs)
curentrywidth += 2;
#endif
}

3
win/curses/cursinvt.c
View File

@@ -118,7 +118,8 @@ curses_add_inv(int y, const glyph_info *glyphinfo UNUSED, CHAR_P accelerator,
stroffset = 4;
}
#if 0 /* FIXME: MENU GLYPHS */
if (accelerator && glyph != NO_GLYPH && iflags.use_menu_glyphs) {
if (accelerator && iflags.use_menu_glyphs
&& glyphinfo->glyph != NO_GLYPH ) {
int symbol;
attr_t glyphclr;