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
include/wintype.h
+1 -1
View File
@@ -83,7 +83,7 @@ struct unicode_representation {
typedef struct glyph_map_entry { typedef struct glyph_map_entry {
unsigned glyphflags; unsigned glyphflags;
struct classic_representation sym; struct classic_representation sym;
uint32 nhcolor; uint32 customcolor;
short int tileidx; short int tileidx;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
struct unicode_representation *u; struct unicode_representation *u;
src/coloratt.c
+1 -1
View File
@@ -860,7 +860,7 @@ set_map_nhcolor(glyph_map *gmap, uint32 nhcolor)
if (!tmpgm) if (!tmpgm)
return 0; return 0;
gmap->nhcolor = nhcolor; gmap->customcolor = nhcolor;
return 1; return 1;
} }
src/display.c
+6 -6
View File
@@ -1974,7 +1974,7 @@ show_glyph(coordxy x, coordxy y, int glyph)
but that triggers full redraw so doesn't matter here); still, but that triggers full redraw so doesn't matter here); still,
be thorough and check everything */ be thorough and check everything */
|| gg.gbuf[y][x].glyphinfo.ttychar != glyphinfo.ttychar || gg.gbuf[y][x].glyphinfo.ttychar != glyphinfo.ttychar
|| gg.gbuf[y][x].glyphinfo.gm.nhcolor != glyphinfo.gm.nhcolor || gg.gbuf[y][x].glyphinfo.gm.customcolor != glyphinfo.gm.customcolor
|| gg.gbuf[y][x].glyphinfo.gm.glyphflags != glyphinfo.gm.glyphflags || gg.gbuf[y][x].glyphinfo.gm.glyphflags != glyphinfo.gm.glyphflags
|| gg.gbuf[y][x].glyphinfo.gm.sym.color != glyphinfo.gm.sym.color || gg.gbuf[y][x].glyphinfo.gm.sym.color != glyphinfo.gm.sym.color
|| gg.gbuf[y][x].glyphinfo.gm.tileidx != glyphinfo.gm.tileidx || gg.gbuf[y][x].glyphinfo.gm.tileidx != glyphinfo.gm.tileidx
@@ -2058,12 +2058,12 @@ clear_glyph_buffer(void)
|| giptr->gm.sym.color != nul_gbuf.glyphinfo.gm.sym.color || giptr->gm.sym.color != nul_gbuf.glyphinfo.gm.sym.color
|| giptr->gm.glyphflags || giptr->gm.glyphflags
!= nul_gbuf.glyphinfo.gm.glyphflags != nul_gbuf.glyphinfo.gm.glyphflags
|| giptr->gm.nhcolor != nul_gbuf.glyphinfo.gm.nhcolor || giptr->gm.customcolor != nul_gbuf.glyphinfo.gm.customcolor
|| giptr->gm.tileidx != nul_gbuf.glyphinfo.gm.tileidx) || giptr->gm.tileidx != nul_gbuf.glyphinfo.gm.tileidx)
#else #else
nul_gbuf.gnew = (giptr->ttychar != ' ' nul_gbuf.gnew = (giptr->ttychar != ' '
|| giptr->gm.sym.color != NO_COLOR || giptr->gm.sym.color != NO_COLOR
|| giptr->gm.nhcolor != 0 || giptr->gm.customcolor != 0
|| (giptr->gm.glyphflags & ~MG_UNEXPL) != 0) || (giptr->gm.glyphflags & ~MG_UNEXPL) != 0)
#endif #endif
? 1 : 0; ? 1 : 0;
@@ -2099,12 +2099,12 @@ row_refresh(coordxy start, coordxy stop, coordxy y)
force = (giptr->ttychar != nul_gbuf.glyphinfo.ttychar force = (giptr->ttychar != nul_gbuf.glyphinfo.ttychar
|| giptr->gm.sym.color != nul_gbuf.glyphinfo.gm.sym.color || giptr->gm.sym.color != nul_gbuf.glyphinfo.gm.sym.color
|| giptr->gm.glyphflags != nul_gbuf.glyphinfo.gm.glyphflags || giptr->gm.glyphflags != nul_gbuf.glyphinfo.gm.glyphflags
|| giptr->gm.nhcolor != nul_gbuf.glyphinfo.gm.nhcolor || giptr->gm.customcolor != nul_gbuf.glyphinfo.gm.customcolor
|| giptr->gm.tileidx != nul_gbuf.glyphinfo.gm.tileidx) || giptr->gm.tileidx != nul_gbuf.glyphinfo.gm.tileidx)
#else #else
force = (giptr->ttychar != ' ' force = (giptr->ttychar != ' '
|| giptr->gm.sym.color != NO_COLOR || giptr->gm.sym.color != NO_COLOR
|| giptr->gm.gm.nhcolor != 0 || giptr->gm.gm.customcolor != 0
|| (giptr->gm.glyphflags & ~MG_UNEXPL) != 0) || (giptr->gm.glyphflags & ~MG_UNEXPL) != 0)
#endif #endif
? 1 : 0; ? 1 : 0;
@@ -2114,7 +2114,7 @@ row_refresh(coordxy start, coordxy stop, coordxy y)
get_bkglyph_and_framecolor(x, y, &bkglyphinfo.glyph, get_bkglyph_and_framecolor(x, y, &bkglyphinfo.glyph,
&bkglyphinfo.framecolor); &bkglyphinfo.framecolor);
if (force || glyph != GLYPH_UNEXPLORED if (force || glyph != GLYPH_UNEXPLORED
|| bkglyphinfo.gm.nhcolor != NO_COLOR) { || bkglyphinfo.framecolor != NO_COLOR) {
print_glyph(WIN_MAP, x, y, print_glyph(WIN_MAP, x, y,
Glyphinfo_at(x, y, glyph), &bkglyphinfo); Glyphinfo_at(x, y, glyph), &bkglyphinfo);
} }
src/glyphs.c
+8 -8
View File
@@ -647,7 +647,7 @@ shuffle_customizations(void)
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
struct unicode_representation *tmp_u[NUM_OBJECTS]; struct unicode_representation *tmp_u[NUM_OBJECTS];
#endif #endif
uint32 tmp_nhcolor[NUM_OBJECTS]; uint32 tmp_customcolor[NUM_OBJECTS];
int duplicate[NUM_OBJECTS]; int duplicate[NUM_OBJECTS];
for (i = 0; i < NUM_OBJECTS; i++) { for (i = 0; i < NUM_OBJECTS; i++) {
@@ -655,7 +655,7 @@ shuffle_customizations(void)
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
tmp_u[i] = (struct unicode_representation *) 0; tmp_u[i] = (struct unicode_representation *) 0;
#endif #endif
tmp_nhcolor[i] = 0; tmp_customcolor[i] = 0;
} }
for (i = 0; i < NUM_OBJECTS; i++) { for (i = 0; i < NUM_OBJECTS; i++) {
int idx = objects[i].oc_descr_idx; int idx = objects[i].oc_descr_idx;
@@ -670,9 +670,9 @@ shuffle_customizations(void)
/* Current structure already appears in tmp_u */ /* Current structure already appears in tmp_u */
struct unicode_representation *other = tmp_u[duplicate[idx]]; struct unicode_representation *other = tmp_u[duplicate[idx]];
#endif #endif
uint32 other_nhcolor = tmp_nhcolor[duplicate[idx]]; uint32 other_customcolor = tmp_customcolor[duplicate[idx]];
tmp_nhcolor[i] = other_nhcolor; tmp_customcolor[i] = other_customcolor;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
tmp_u[i] = (struct unicode_representation *) tmp_u[i] = (struct unicode_representation *)
alloc(sizeof *tmp_u[i]); alloc(sizeof *tmp_u[i]);
@@ -683,7 +683,7 @@ shuffle_customizations(void)
} }
#endif #endif
} else { } else {
tmp_nhcolor[i] = obj_glyphs[idx].nhcolor; tmp_customcolor[i] = obj_glyphs[idx].customcolor;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
tmp_u[i] = obj_glyphs[idx].u; tmp_u[i] = obj_glyphs[idx].u;
#endif #endif
@@ -691,12 +691,12 @@ shuffle_customizations(void)
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
obj_glyphs[idx].u != NULL || obj_glyphs[idx].u != NULL ||
#endif #endif
obj_glyphs[idx].nhcolor != 0) { obj_glyphs[idx].customcolor != 0) {
duplicate[idx] = i; duplicate[idx] = i;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
obj_glyphs[idx].u = NULL; obj_glyphs[idx].u = NULL;
#endif #endif
obj_glyphs[idx].nhcolor = 0; obj_glyphs[idx].customcolor = 0;
} }
} }
} }
@@ -709,7 +709,7 @@ shuffle_customizations(void)
} }
obj_glyphs[i].u = tmp_u[i]; obj_glyphs[i].u = tmp_u[i];
#endif #endif
obj_glyphs[i].nhcolor = tmp_nhcolor[i]; obj_glyphs[i].customcolor = tmp_customcolor[i];
} }
} }
} }
src/symbols.c
+2 -2
View File
@@ -1102,8 +1102,8 @@ clear_all_glyphmap_colors(void)
int glyph; int glyph;
for (glyph = 0; glyph < MAX_GLYPH; ++glyph) { for (glyph = 0; glyph < MAX_GLYPH; ++glyph) {
if (glyphmap[glyph].nhcolor) if (glyphmap[glyph].customcolor)
glyphmap[glyph].nhcolor = 0; glyphmap[glyph].customcolor = 0;
} }
} }
sys/msdos/vidvesa.c
+2 -2
View File
@@ -690,10 +690,10 @@ vesa_xputg(const glyph_info *glyphinfo, const glyph_info *bkglyphinfo UNUSED)
ch = glyphinfo->gm.u->utf32ch; ch = glyphinfo->gm.u->utf32ch;
} }
#endif #endif
if (vesa_pixel_size > 8 && glyphinfo->gm.nhcolor != 0) { if (vesa_pixel_size > 8 && glyphinfo->gm.customcolor != 0) {
/* FIXME: won't display black (0,0,0) correctly, but the background /* FIXME: won't display black (0,0,0) correctly, but the background
is usually black anyway */ is usually black anyway */
attr = glyphinfo->gm.nhcolor | 0x80000000; attr = glyphinfo->gm.customcolor | 0x80000000;
} }
row = currow; row = currow;
win/Qt/qt_map.cpp
+5 -5
View File
@@ -586,14 +586,14 @@ void NetHackQtMapViewport::PrintGlyph(int x, int y,
Glyphttychar(x, y) = glyphinfo->gm.u->utf32ch; Glyphttychar(x, y) = glyphinfo->gm.u->utf32ch;
} }
#endif #endif
if (glyphinfo->gm.nhcolor != 0) { if (glyphinfo->gm.customcolor != 0) {
uint32 nhcolor = COLORVAL(glyphinfo->gm.nhcolor); uint32 nhcolor = COLORVAL(glyphinfo->gm.customcolor);
if (glyphinfo->gm.nhcolor == nhcolor) { if (glyphinfo->gm.customcolor == nhcolor) {
/* 24-bit color */ /* 24-bit color */
Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.nhcolor) | 0x80000000; Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.customcolor) | 0x80000000;
} else { } else {
/* NH_BASIC_COLOR */ /* NH_BASIC_COLOR */
Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.nhcolor); Glyphcolor(x, y) = COLORVAL(glyphinfo->gm.customcolor);
} }
} }
Glyphflags(x, y) = glyphinfo->gm.glyphflags; Glyphflags(x, y) = glyphinfo->gm.glyphflags;
win/X11/winmap.c
+6 -6
View File
@@ -135,24 +135,24 @@ X11_print_glyph(
special = glyphinfo->gm.glyphflags; special = glyphinfo->gm.glyphflags;
ch = glyph_char(glyphinfo); ch = glyph_char(glyphinfo);
if (glyphinfo->gm.nhcolor != 0) { if (glyphinfo->gm.customcolor != 0) {
if ((glyphinfo->gm.nhcolor & NH_BASIC_COLOR) != 0) { if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) != 0) {
/* NH_BASIC_COLOR */ /* NH_BASIC_COLOR */
color = COLORVAL(glyphinfo->gm.nhcolor); color = COLORVAL(glyphinfo->gm.customcolor);
#if 0 #if 0
} else if (iflags.colorcount == 256 } else if (iflags.colorcount == 256
&& (X11_procs.wincap2 & WC2_EXTRACOLORS) != 0 && (X11_procs.wincap2 & WC2_EXTRACOLORS) != 0
&& (glyphinfo->gm.nhcolor & NH_BASIC_COLOR) == 0) { && (glyphinfo->gm.customcolor & NH_BASIC_COLOR) == 0) {
int clr256idx; int clr256idx;
uint32 closecolor = 0; uint32 closecolor = 0;
if (closest_color(COLORVAL(glyphinfo->gm.nhcolor), if (closest_color(COLORVAL(glyphinfo->gm.customcolor),
&closecolor, &clr256idx)) &closecolor, &clr256idx))
nhcolor = COLORVAL(closecolor); nhcolor = COLORVAL(closecolor);
#endif #endif
} else { } else {
/* 24-bit color, NH_BASIC_COLOR == 0 */ /* 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) { if (special != map_info->tile_map.glyphs[y][x].glyphflags) {
win/curses/cursmain.c
+4 -4
View File
@@ -926,14 +926,14 @@ curses_print_glyph(
* color mode. On top of this, the windowport only supports 16 color mode. * 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 * Thus, we only allow users to customize glyph colors to the basic NetHack
* colors. */ * colors. */
if (glyphinfo->gm.nhcolor != 0 if (glyphinfo->gm.customcolor != 0
&& (curses_procs.wincap2 & WC2_EXTRACOLORS) != 0) { && (curses_procs.wincap2 & WC2_EXTRACOLORS) != 0) {
if ((glyphinfo->gm.nhcolor & NH_BASIC_COLOR) != 0) { if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) != 0) {
color = COLORVAL(glyphinfo->gm.nhcolor); color = COLORVAL(glyphinfo->gm.customcolor);
#if 0 #if 0
} else { } else {
/* 24-bit color, NH_BASIC_COLOR == 0 */ /* 24-bit color, NH_BASIC_COLOR == 0 */
nhcolor = COLORVAL(glyphinfo->gm.nhcolor); nhcolor = COLORVAL(glyphinfo->gm.customcolor);
#endif #endif
} }
} }
win/tty/wintty.c
+6 -6
View File
@@ -3837,14 +3837,14 @@ tty_print_glyph(
int clridx; int clridx;
if (iflags.colorcount >= 256 if (iflags.colorcount >= 256
&& glyphinfo->gm.nhcolor != 0 && glyphinfo->gm.customcolor != 0
&& !calling_from_update_inventory && !calling_from_update_inventory
&& (tty_procs.wincap2 & WC2_EXTRACOLORS) != 0) { && (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 */ /* don't set colordone or nhcolor */
color = COLORVAL(glyphinfo->gm.nhcolor); color = COLORVAL(glyphinfo->gm.customcolor);
} else if (iflags.colorcount == 256) { } else if (iflags.colorcount == 256) {
if (closest_color(COLORVAL(glyphinfo->gm.nhcolor), if (closest_color(COLORVAL(glyphinfo->gm.customcolor),
&closecolor, &clridx)) { &closecolor, &clridx)) {
if (ttyDisplay->color != NO_COLOR) { if (ttyDisplay->color != NO_COLOR) {
term_end_color(); term_end_color();
@@ -3854,7 +3854,7 @@ tty_print_glyph(
colordone = TRUE; colordone = TRUE;
} }
} else { } else {
nhcolor = COLORVAL(glyphinfo->gm.nhcolor); nhcolor = COLORVAL(glyphinfo->gm.customcolor);
if (ttyDisplay->color != NO_COLOR) { if (ttyDisplay->color != NO_COLOR) {
term_end_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 (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) */ to see although the Valkyrie quest ends up being hard on the eyes) */
if (iflags.use_color if (iflags.use_color
&& bkglyphinfo && bkglyphinfo->gm.nhcolor != NO_COLOR) { && bkglyphinfo && bkglyphinfo->gm.customcolor != NO_COLOR) {
ttyDisplay->framecolor = bkglyphinfo->framecolor; ttyDisplay->framecolor = bkglyphinfo->framecolor;
term_start_bgcolor(bkglyphinfo->framecolor); term_start_bgcolor(bkglyphinfo->framecolor);
} else if ((special & MG_PET) != 0 && iflags.hilite_pet) { } else if ((special & MG_PET) != 0 && iflags.hilite_pet) {
win/win32/mhmap.c
+6 -6
View File
@@ -979,12 +979,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.nhcolor & NH_BASIC_COLOR) == 0) { if ((glyphinfo->gm.customcolor & NH_BASIC_COLOR) == 0) {
rgbcolor = RGB((glyphinfo->gm.nhcolor >> 16) & 0xFF, rgbcolor = RGB((glyphinfo->gm.customcolor >> 16) & 0xFF,
(glyphinfo->gm.nhcolor >> 8) & 0xFF, (glyphinfo->gm.customcolor >> 8) & 0xFF,
(glyphinfo->gm.nhcolor >> 0) & 0xFF); (glyphinfo->gm.customcolor >> 0) & 0xFF);
} else { } else {
color = (int) COLORVAL(glyphinfo->gm.nhcolor); color = (int) COLORVAL(glyphinfo->gm.customcolor);
rgbcolor = nhcolor_to_RGB(color); 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)
@@ -1063,7 +1063,7 @@ static void setGlyph(PNHMapWindow data, int i, int j,
|| (data->bkmap[i][j].glyph != bg->glyph) || (data->bkmap[i][j].glyph != bg->glyph)
|| data->map[i][j].ttychar != fg->ttychar || data->map[i][j].ttychar != fg->ttychar
|| data->map[i][j].gm.sym.color != fg->gm.sym.color || 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.glyphflags != fg->gm.glyphflags
|| data->map[i][j].gm.tileidx != fg->gm.tileidx) { || data->map[i][j].gm.tileidx != fg->gm.tileidx) {
data->map[i][j] = *fg; data->map[i][j] = *fg;