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

ENHANCED_SYMBOLS: store all CLR_ colors specially

Browse Source 
The 0x1000000 bit (NH_BASIC_COLOR bit) was used to mark
CLR_BLACK when storing it in u->ucolor. Now, all of the basic CLR_*
colors are stored that way.

The NH_BASIC_COLOR bit indicates that the value in u->ucolor is
not an rgb value, rather it is one of the 0-15 basic NetHack colors.
The window-ports need to strip the NH_BASIC_COLOR bit off before using
it for color changes.
This commit is contained in:
nhmall
2024-03-03 18:31:11 -05:00
parent 3fb35e390b
commit 6619d10d90
10 changed files with 103 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
win/Qt/qt_map.cpp
View File

@@ -587,7 +587,12 @@ void NetHackQtMapViewport::PrintGlyph(int x, int y,
&& glyphinfo->gm.u->utf8str) {
Glyphttychar(x, y) = glyphinfo->gm.u->utf32ch;
if (glyphinfo->gm.u->ucolor != 0) {
Glyphcolor(x, y) = glyphinfo->gm.u->ucolor | 0x80000000;
if ((glyphinfo->gm.u->ucolor & NH_BASIC_COLOR) == 0) {
Glyphcolor(x, y) = glyphinfo->gm.u->ucolor | 0x80000000;
} else {
Glyphcolor(x, y) =
(uint32) glyphinfo->gm.u->ucolor & ~NH_BASIC_COLOR;
}
}
}
#endif