Remove TEXTCOLOR build option

This commit is contained in:
nhmall
2023-11-22 16:01:58 -05:00
parent 6272e18d7b
commit 04082a2033
60 changed files with 105 additions and 483 deletions

View File

@@ -2457,7 +2457,6 @@ map_glyphinfo(
* as well as to regular display.)
*/
if (is_you) {
#ifdef TEXTCOLOR
if (!iflags.use_color || Upolyd || glyph != hero_glyph) {
; /* color tweak not needed (!use_color) or not wanted (poly'd
or riding--which uses steed's color, not hero's) */
@@ -2471,7 +2470,6 @@ map_glyphinfo(
by newsym()); we change the color to same as human hero */
glyphinfo->gm.sym.color = HI_DOMESTIC;
}
#endif
/* accessibility
This unchanging display character for hero was requested by
a blind player to enhance screen reader use.
@@ -2495,7 +2493,6 @@ map_glyphinfo(
glyphinfo->glyph = glyph;
}
#ifdef TEXTCOLOR
/*
* This must be the same order as used for buzz() in zap.c.
* The zap_color_ and altar_color_ enums are in decl.h.
@@ -2522,9 +2519,6 @@ int wallcolors[sokoban_walls + 1] = {
/* CLR_GRAY, CLR_BROWN, CLR_RED, CLR_GRAY, CLR_BRIGHT_BLUE, */
};
#endif /* text color */
#ifdef TEXTCOLOR
#define zap_color(n) color = iflags.use_color ? zapcolors[n] : NO_COLOR
#define cmap_color(n) color = iflags.use_color ? defsyms[n].color : NO_COLOR
#define obj_color(n) color = iflags.use_color ? objects[n].oc_color : NO_COLOR
@@ -2537,19 +2531,6 @@ int wallcolors[sokoban_walls + 1] = {
color = iflags.use_color ? explodecolors[n] : NO_COLOR
#define wall_color(n) color = iflags.use_color ? wallcolors[n] : NO_COLOR
#define altar_color(n) color = iflags.use_color ? altarcolors[n] : NO_COLOR
#else /* no text color */
#define zap_color(n)
#define cmap_color(n)
#define obj_color(n)
#define mon_color(n)
#define invis_color(n)
#define pet_color(c)
#define warn_color(n)
#define explode_color(n)
#define wall_color(n)
#define altar_color(n)
#endif
#if 0
#define is_objpile(x, y) \
@@ -2797,13 +2778,11 @@ reset_glyphmap(enum glyphmap_change_triggers trigger)
*/
if (has_rogue_color) {
color = cmap_to_roguecolor(cmap);
#ifdef TEXTCOLOR
/* provide a visible difference if normal and lit corridor
use the same symbol */
} else if (cmap == S_litcorr
&& sym == gs.showsyms[S_corr + SYM_OFF_P]) {
color = CLR_WHITE;
#endif
/* likewise for corridor and engraving-in-corridor */
} else if (cmap == S_engrcorr
&& (sym == gs.showsyms[S_corr + SYM_OFF_P]
@@ -2940,13 +2919,11 @@ reset_glyphmap(enum glyphmap_change_triggers trigger)
if (gs.showsyms[pet_override] != ' ')
gmap->sym.symidx = SYM_PET_OVERRIDE + SYM_OFF_X;
}
#ifdef TEXTCOLOR
/* Turn off color if no color defined, or rogue level w/o PC graphics.
*/
if ((!has_color(color)
|| ((gg.glyphmap_perlevel_flags & GMAP_ROGUELEVEL)
&& !has_rogue_color)) || !iflags.use_color)
#endif
color = NO_COLOR;
gmap->sym.color = color;
}