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

rename glyphmap nhcolor field to customcolor

Browse Source
This commit is contained in:
nhmall
2024-03-24 11:04:31 -04:00
parent ec8f237960
commit 750cf7f619
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
win/Qt/qt_map.cpp
View File

@@ -586,14 +586,14 @@ void NetHackQtMapViewport::PrintGlyph(int x, int y,
Glyphttychar(x, y) = glyphinfo->gm.u->utf32ch;
}
#endif
if (glyphinfo->gm.nhcolor != 0) {
uint32 nhcolor = COLORVAL(glyphinfo->gm.nhcolor);
if (glyphinfo->gm.nhcolor == nhcolor) {
if (glyphinfo->gm.customcolor != 0) {
uint32 nhcolor = COLORVAL(glyphinfo->gm.customcolor);
if (glyphinfo->gm.customcolor == nhcolor) {
/* 24-bit color */
Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.nhcolor) | 0x80000000;
Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.customcolor) | 0x80000000;
} else {
/* NH_BASIC_COLOR */
Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.nhcolor);
Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.customcolor);
}
}
Glyphflags(x, y) = glyphinfo->gm.glyphflags;