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;

12
win/X11/winmap.c
View File

@@ -135,24 +135,24 @@ X11_print_glyph(
special = glyphinfo->gm.glyphflags;
ch = glyph_char(glyphinfo);
if (glyphinfo->gm.nhcolor != 0) {
if ((glyphinfo->gm.nhcolor & NH_BASIC_COLOR) != 0) {
if (glyphinfo->gm.customcolor != 0) {
if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) != 0) {
/* NH_BASIC_COLOR */
color = COLORVAL(glyphinfo->gm.nhcolor);
color = COLORVAL(glyphinfo->gm.customcolor);
#if 0
} else if (iflags.colorcount == 256
&& (X11_procs.wincap2 & WC2_EXTRACOLORS) != 0
&& (glyphinfo->gm.nhcolor & NH_BASIC_COLOR) == 0) {
&& (glyphinfo->gm.customcolor & NH_BASIC_COLOR) == 0) {
int clr256idx;
uint32 closecolor = 0;
if (closest_color(COLORVAL(glyphinfo->gm.nhcolor),
if (closest_color(COLORVAL(glyphinfo->gm.customcolor),
&closecolor, &clr256idx))
nhcolor = COLORVAL(closecolor);
#endif
} else {
/* 24-bit color, NH_BASIC_COLOR == 0 */
nhcolor = COLORVAL(glyphinfo->gm.nhcolor);
nhcolor = COLORVAL(glyphinfo->gm.customcolor);
}
}
if (special != map_info->tile_map.glyphs[y][x].glyphflags) {

8
win/curses/cursmain.c
View File

@@ -926,14 +926,14 @@ curses_print_glyph(
* color mode. On top of this, the windowport only supports 16 color mode.
* Thus, we only allow users to customize glyph colors to the basic NetHack
* colors. */
if (glyphinfo->gm.nhcolor != 0
if (glyphinfo->gm.customcolor != 0
&& (curses_procs.wincap2 & WC2_EXTRACOLORS) != 0) {
if ((glyphinfo->gm.nhcolor & NH_BASIC_COLOR) != 0) {
color = COLORVAL(glyphinfo->gm.nhcolor);
if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) != 0) {
color = COLORVAL(glyphinfo->gm.customcolor);
#if 0
} else {
/* 24-bit color, NH_BASIC_COLOR == 0 */
nhcolor = COLORVAL(glyphinfo->gm.nhcolor);
nhcolor = COLORVAL(glyphinfo->gm.customcolor);
#endif
}
}

12
win/tty/wintty.c
View File

@@ -3837,14 +3837,14 @@ tty_print_glyph(
int clridx;
if (iflags.colorcount >= 256
&& glyphinfo->gm.nhcolor != 0
&& glyphinfo->gm.customcolor != 0
&& !calling_from_update_inventory
&& (tty_procs.wincap2 & WC2_EXTRACOLORS) != 0) {
if ((glyphinfo->gm.nhcolor & NH_BASIC_COLOR) != 0) {
if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) != 0) {
/* don't set colordone or nhcolor */
color = COLORVAL(glyphinfo->gm.nhcolor);
color = COLORVAL(glyphinfo->gm.customcolor);
} else if (iflags.colorcount == 256) {
if (closest_color(COLORVAL(glyphinfo->gm.nhcolor),
if (closest_color(COLORVAL(glyphinfo->gm.customcolor),
&closecolor, &clridx)) {
if (ttyDisplay->color != NO_COLOR) {
term_end_color();
@@ -3854,7 +3854,7 @@ tty_print_glyph(
colordone = TRUE;
}
} else {
nhcolor = COLORVAL(glyphinfo->gm.nhcolor);
nhcolor = COLORVAL(glyphinfo->gm.customcolor);
if (ttyDisplay->color != NO_COLOR) {
term_end_color();
}
@@ -3883,7 +3883,7 @@ tty_print_glyph(
(tried bold for ice but it didn't look very good; inverse is easier
to see although the Valkyrie quest ends up being hard on the eyes) */
if (iflags.use_color
&& bkglyphinfo && bkglyphinfo->gm.nhcolor != NO_COLOR) {
&& bkglyphinfo && bkglyphinfo->gm.customcolor != NO_COLOR) {
ttyDisplay->framecolor = bkglyphinfo->framecolor;
term_start_bgcolor(bkglyphinfo->framecolor);
} else if ((special & MG_PET) != 0 && iflags.hilite_pet) {

12
win/win32/mhmap.c
View File

@@ -979,12 +979,12 @@ paintGlyph(PNHMapWindow data, int i, int j, RECT * rect)
ch = glyphinfo->gm.u->utf32ch;
}
#endif
if ((glyphinfo->gm.nhcolor & NH_BASIC_COLOR) == 0) {
rgbcolor = RGB((glyphinfo->gm.nhcolor >> 16) & 0xFF,
(glyphinfo->gm.nhcolor >> 8) & 0xFF,
(glyphinfo->gm.nhcolor >> 0) & 0xFF);
if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) == 0) {
rgbcolor = RGB((glyphinfo->gm.customcolor >> 16) & 0xFF,
(glyphinfo->gm.customcolor >> 8) & 0xFF,
(glyphinfo->gm.customcolor >> 0) & 0xFF);
} else {
color = (int) COLORVAL(glyphinfo->gm.nhcolor);
color = (int) COLORVAL(glyphinfo->gm.customcolor);
rgbcolor = nhcolor_to_RGB(color);
}
if (((data->map[i][j].gm.glyphflags & MG_PET) && iflags.hilite_pet)
@@ -1063,7 +1063,7 @@ static void setGlyph(PNHMapWindow data, int i, int j,
|| (data->bkmap[i][j].glyph != bg->glyph)
|| data->map[i][j].ttychar != fg->ttychar
|| data->map[i][j].gm.sym.color != fg->gm.sym.color
|| data->map[i][j].gm.nhcolor != fg->gm.nhcolor
|| data->map[i][j].gm.customcolor != fg->gm.customcolor
|| data->map[i][j].gm.glyphflags != fg->gm.glyphflags
|| data->map[i][j].gm.tileidx != fg->gm.tileidx) {
data->map[i][j] = *fg;