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

2
src/coloratt.c
View File

@@ -860,7 +860,7 @@ set_map_nhcolor(glyph_map *gmap, uint32 nhcolor)
if (!tmpgm)
return 0;
gmap->nhcolor = nhcolor;
gmap->customcolor = nhcolor;
return 1;
}

12
src/display.c
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,
be thorough and check everything */
|| 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.sym.color != glyphinfo.gm.sym.color
|| 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.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)
#else
nul_gbuf.gnew = (giptr->ttychar != ' '
|| giptr->gm.sym.color != NO_COLOR
|| giptr->gm.nhcolor != 0
|| giptr->gm.customcolor != 0
|| (giptr->gm.glyphflags & ~MG_UNEXPL) != 0)
#endif
? 1 : 0;
@@ -2099,12 +2099,12 @@ row_refresh(coordxy start, coordxy stop, coordxy y)
force = (giptr->ttychar != nul_gbuf.glyphinfo.ttychar
|| giptr->gm.sym.color != nul_gbuf.glyphinfo.gm.sym.color
|| 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)
#else
force = (giptr->ttychar != ' '
|| giptr->gm.sym.color != NO_COLOR
|| giptr->gm.gm.nhcolor != 0
|| giptr->gm.gm.customcolor != 0
|| (giptr->gm.glyphflags & ~MG_UNEXPL) != 0)
#endif
? 1 : 0;
@@ -2114,7 +2114,7 @@ row_refresh(coordxy start, coordxy stop, coordxy y)
get_bkglyph_and_framecolor(x, y, &bkglyphinfo.glyph,
&bkglyphinfo.framecolor);
if (force || glyph != GLYPH_UNEXPLORED
|| bkglyphinfo.gm.nhcolor != NO_COLOR) {
|| bkglyphinfo.framecolor != NO_COLOR) {
print_glyph(WIN_MAP, x, y,
Glyphinfo_at(x, y, glyph), &bkglyphinfo);
}

16
src/glyphs.c
View File

@@ -647,7 +647,7 @@ shuffle_customizations(void)
#ifdef ENHANCED_SYMBOLS
struct unicode_representation *tmp_u[NUM_OBJECTS];
#endif
uint32 tmp_nhcolor[NUM_OBJECTS];
uint32 tmp_customcolor[NUM_OBJECTS];
int duplicate[NUM_OBJECTS];
for (i = 0; i < NUM_OBJECTS; i++) {
@@ -655,7 +655,7 @@ shuffle_customizations(void)
#ifdef ENHANCED_SYMBOLS
tmp_u[i] = (struct unicode_representation *) 0;
#endif
tmp_nhcolor[i] = 0;
tmp_customcolor[i] = 0;
}
for (i = 0; i < NUM_OBJECTS; i++) {
int idx = objects[i].oc_descr_idx;
@@ -670,9 +670,9 @@ shuffle_customizations(void)
/* Current structure already appears in tmp_u */
struct unicode_representation *other = tmp_u[duplicate[idx]];
#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
tmp_u[i] = (struct unicode_representation *)
alloc(sizeof *tmp_u[i]);
@@ -683,7 +683,7 @@ shuffle_customizations(void)
}
#endif
} else {
tmp_nhcolor[i] = obj_glyphs[idx].nhcolor;
tmp_customcolor[i] = obj_glyphs[idx].customcolor;
#ifdef ENHANCED_SYMBOLS
tmp_u[i] = obj_glyphs[idx].u;
#endif
@@ -691,12 +691,12 @@ shuffle_customizations(void)
#ifdef ENHANCED_SYMBOLS
obj_glyphs[idx].u != NULL ||
#endif
obj_glyphs[idx].nhcolor != 0) {
obj_glyphs[idx].customcolor != 0) {
duplicate[idx] = i;
#ifdef ENHANCED_SYMBOLS
obj_glyphs[idx].u = NULL;
#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];
#endif
obj_glyphs[i].nhcolor = tmp_nhcolor[i];
obj_glyphs[i].customcolor = tmp_customcolor[i];
}
}
}

4
src/symbols.c
View File

@@ -1102,8 +1102,8 @@ clear_all_glyphmap_colors(void)
int glyph;
for (glyph = 0; glyph < MAX_GLYPH; ++glyph) {
if (glyphmap[glyph].nhcolor)
glyphmap[glyph].nhcolor = 0;
if (glyphmap[glyph].customcolor)
glyphmap[glyph].customcolor = 0;
}
}