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

fix broken Windows GUI ascii mode text color

Browse Source 
Issue identified in
https://github.com/NetHack/NetHack/issues/1359

Resolves #1359
This commit is contained in:
nhmall
2025-09-05 16:38:56 -04:00
parent e8e1868b70
commit d5d40b322c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
win/win32/mhmap.c
View File

@@ -982,13 +982,12 @@ paintGlyph(PNHMapWindow data, int i, int j, RECT * rect)
ch = glyphinfo->gm.u->utf32ch; ch = glyphinfo->gm.u->utf32ch;
} }
#endif #endif
if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) == 0) { if (glyphinfo->gm.customcolor != 0
rgbcolor = RGB((glyphinfo->gm.customcolor >> 16) & 0xFF, && (mswin_procs.wincap2 & WC2_EXTRACOLORS) != 0) {
(glyphinfo->gm.customcolor >> 8) & 0xFF, if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) != 0) {
(glyphinfo->gm.customcolor >> 0) & 0xFF); color = (int) COLORVAL(glyphinfo->gm.customcolor);
} else { rgbcolor = nhcolor_to_RGB(color);
color = (int) COLORVAL(glyphinfo->gm.customcolor); }
rgbcolor = nhcolor_to_RGB(color);
} }
if (((data->map[i][j].gm.glyphflags & MG_PET) && iflags.hilite_pet) if (((data->map[i][j].gm.glyphflags & MG_PET) && iflags.hilite_pet)
|| ((data->map[i][j].gm.glyphflags & (MG_DETECT | MG_BW_LAVA || ((data->map[i][j].gm.glyphflags & (MG_DETECT | MG_BW_LAVA