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

Remove TEXTCOLOR build option

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
include/defsym.h
View File

@@ -34,11 +34,7 @@
#undef CLR
#endif
#ifdef TEXTCOLOR
#define CLR(n) n
#else
#define CLR(n)
#endif
#if defined(PCHAR_S_ENUM) || defined(PCHAR_PARSE) \
|| defined(PCHAR_DRAWING) || defined(PCHAR_TILES)

2
include/display.h
View File

@@ -1046,12 +1046,10 @@ typedef struct {
glyph_info glyphinfo;
} gbuf_entry;
#ifdef TEXTCOLOR
extern const int altarcolors[];
extern const int zapcolors[];
extern const int explodecolors[];
extern int wallcolors[];
#endif
/* If TILES_IN_GLYPHMAP is defined during build, this is defined
* in the generated tile.c, complete with appropriate tile references in

3
include/pcconf.h
View File

@@ -246,7 +246,6 @@
#include <fcntl.h>
#ifdef MSDOS
#define TEXTCOLOR /* */
#define PORT_HELP "msdoshlp.txt" /* msdos port specific help file */
#endif
@@ -288,9 +287,7 @@
#endif
#endif
#define ASCIIGRAPH
#ifdef TEXTCOLOR
#define VIDEOSHADES
#endif
/* SCREEN_8514, SCREEN_VESA are only placeholders presently - sub VGA instead
*/
#if defined(SCREEN_8514)

2
include/permonst.h
View File

@@ -60,9 +60,7 @@ struct permonst {
mflags2; /* more boolean bitflags */
unsigned short mflags3; /* yet more boolean bitflags */
uchar difficulty; /* toughness (formerly from makedefs -m) */
#ifdef TEXTCOLOR
uchar mcolor; /* color to use */
#endif
};
extern NEARDATA struct permonst mons[]; /* the master list of monster types */

2
include/sym.h
View File

@@ -52,9 +52,7 @@ enum symset_handling_types {
struct symdef {
uchar sym;
const char *explanation;
#ifdef TEXTCOLOR
uchar color;
#endif
};
enum symparse_range {

2
include/tcap.h
View File

@@ -47,12 +47,10 @@ extern struct tc_lcl_data { /* defined and set up in termcap.c */
extern short ospeed; /* set up in termcap.c */
#ifdef TEXTCOLOR
#ifdef TOS
extern const char *hilites[CLR_MAX];
#else
extern NEARDATA char *hilites[CLR_MAX];
#endif
#endif
#endif /* TCAP_H */

7
include/unixconf.h
View File

@@ -55,11 +55,6 @@
* particular, it should NOT be defined for the UNIXPC
* unless you remove the use of the shared library in
* the Makefile */
#define TEXTCOLOR /* Use System V r3.2 terminfo color support
* and/or ANSI color support on termcap systems
* and/or X11 color. Note: if you get compiler
* warnings about 'has_colors()' being implicitly
* declared, uncomment NEED_HAS_COLORS_DECL below. */
#define POSIX_JOB_CONTROL /* use System V / Solaris 2.x / POSIX job control
* (e.g., VSUSP) */
#define POSIX_TYPES /* use POSIX types for system calls and termios */
@@ -365,7 +360,7 @@
#endif
#endif
/* Relevant for some systems which enable TEXTCOLOR: some older versions
/* Relevant for some systems: some older versions
of curses (the run-time library optionally used by nethack's tty
interface in addition to its curses interface) supply 'has_colors()'
but corresponding <curses.h> doesn't declare it. has_colors() is used

11
include/vmsconf.h
View File

@@ -92,17 +92,6 @@ PANICTRACE_GDB=2 #at conclusion of panic, show a call traceback and then
*/
#define SELECTSAVED
/*
* You may define TEXTCOLOR if your system has any terminals that recognize
* ANSI color sequences of the form ``<ESCAPE>[#;#m'', where the first # is
* a number between 40 and 47 represented background color, and the second
* # is a number between 30 and 37 representing the foreground color.
* GIGI terminals and DECterm windows on color VAXstations support these
* color escape sequences, as do some 3rd party terminals and many micro
* computers.
*/
/* #define TEXTCOLOR */
/*
* If you define USE_QIO_INPUT, then you'll get raw characters from the
* keyboard, not unlike those of the unix version of Nethack. This will

4
include/winX.h
View File

@@ -49,7 +49,6 @@ typedef unsigned char X11_color;
#endif
struct text_map_info_t {
X11_map_symbol text[ROWNO][COLNO]; /* Actual displayed screen. */
#ifdef TEXTCOLOR
X11_color colors[ROWNO][COLNO]; /* Color of each character. */
X11_color framecolors[ROWNO][COLNO]; /* Color of background
behind text */
@@ -57,7 +56,8 @@ struct text_map_info_t {
inv_color_gcs[CLR_MAX]; /* GC for each inverse color */
#define copy_gc color_gcs[NO_COLOR]
#define inv_copy_gc inv_color_gcs[NO_COLOR]
#else
#if 0
/* was else from old textcolor days */
GC copy_gc, /* Drawing GC */
inv_copy_gc; /* Inverse drawing GC */
#endif

1
include/wincurs.h
View File

@@ -15,7 +15,6 @@ extern WINDOW *mapwin, *statuswin, *messagewin; /* Main windows */
extern WINDOW *activemenu; /* curses window for menu requesting a
* count; affects count_window refresh */
#define TEXTCOLOR /* Allow color */
#define NHW_END 19
#define OFF 0
#define ON 1

2
include/windconf.h
View File

@@ -7,8 +7,6 @@
/* #define SHELL */ /* nt use of pcsys routines caused a hang */
#define TEXTCOLOR /* Color text */
#define EXEPATH /* Allow .exe location to be used as HACKDIR */
#define TRADITIONAL_GLYPHMAP /* Store glyph mappings at level change time */

4
include/wintty.h
View File

@@ -90,10 +90,8 @@ struct WinDesc {
struct DisplayDesc {
short rows, cols; /* width and height of tty display */
short curx, cury; /* current cursor position on the screen */
#ifdef TEXTCOLOR
int color; /* current color */
uint32 framecolor; /* current background color */
#endif
int attrs; /* attributes in effect */
int toplin; /* flag for topl stuff */
int rawprint; /* number of raw_printed lines since synch */
@@ -187,11 +185,9 @@ extern void term_end_attr(int attr);
extern void term_start_raw_bold(void);
extern void term_end_raw_bold(void);
#ifdef TEXTCOLOR
extern void term_end_color(void);
extern void term_start_color(int color);
extern void term_start_bgcolor(int color);
#endif /* TEXTCOLOR */
#ifdef ENHANCED_SYMBOLS
extern void term_start_24bitcolor(struct unicode_representation *);
extern void term_end_24bitcolor(void); /* termcap.c, consoletty.c */