Since the touchstone uses objclass oc_color we need

to make that field unconditional, otherwise
NetHack won't compile without TEXTCOLOR defined.

Also provides at least an interim solution for the has_color()
problem that Warwick pointed out.

Lastly, Archeologists know touchstones.
This commit is contained in:
nethack.allison
2002-01-12 02:16:09 +00:00
parent 2e62cf4194
commit f64c0ac241
6 changed files with 10 additions and 12 deletions

View File

@@ -6,6 +6,7 @@
#if defined(TTY_GRAPHICS)
#include "wintty.h" /* for prototype of has_color() only */
#endif
#include "color.h"
int explcolors[] = {
CLR_BLACK, /* dark */
@@ -17,6 +18,10 @@ int explcolors[] = {
CLR_WHITE, /* frosty */
};
#if !defined(TTY_GRAPHICS)
#define has_color(n) TRUE
#endif
#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