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

mapglyph.c w/o TEXTCOLOR

Browse Source 
Avoid warnings when TEXTCOLOR isn't enabled.
This commit is contained in:
PatR
2018-05-15 17:06:51 -07:00
parent 8dc2c59796
commit 1ecb2c1e79
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mapglyph.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mapglyph.c $NHDT-Date: 1448175698 2015/11/22 07:01:38 $ $NHDT-Branch: master $:$NHDT-Revision: 1.40 $ */ /* NetHack 3.6 mapglyph.c $NHDT-Date: 1526429201 2018/05/16 00:06:41 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.47 $ */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -9,7 +9,12 @@
#include "color.h" #include "color.h"
#define HI_DOMESTIC CLR_WHITE /* monst.c */ #define HI_DOMESTIC CLR_WHITE /* monst.c */
static int explcolors[] = { #if !defined(TTY_GRAPHICS)
#define has_color(n) TRUE
#endif
#ifdef TEXTCOLOR
static const int explcolors[] = {
CLR_BLACK, /* dark */ CLR_BLACK, /* dark */
CLR_GREEN, /* noxious */ CLR_GREEN, /* noxious */
CLR_BROWN, /* muddy */ CLR_BROWN, /* muddy */
@@ -19,11 +24,6 @@ static int explcolors[] = {
CLR_WHITE, /* frosty */ 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 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 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 #define obj_color(n) color = iflags.use_color ? objects[n].oc_color : NO_COLOR
@@ -233,6 +233,8 @@ unsigned *ospecial;
*ospecial = special; *ospecial = special;
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
*ocolor = color; *ocolor = color;
#else
nhUse(ocolor);
#endif #endif
return idx; return idx;
} }
@@ -241,7 +243,7 @@ char *
encglyph(glyph) encglyph(glyph)
int glyph; int glyph;
{ {
static char encbuf[20]; static char encbuf[20]; /* 10+1 would suffice */
Sprintf(encbuf, "\\G%04X%04X", context.rndencode, glyph); Sprintf(encbuf, "\\G%04X%04X", context.rndencode, glyph);
return encbuf; return encbuf;
@@ -338,6 +340,7 @@ int attr;
const char *str; const char *str;
{ {
char buf[BUFSZ]; char buf[BUFSZ];
/* now send it to the normal putstr */ /* now send it to the normal putstr */
putstr(window, attr, decode_mixed(buf, str)); putstr(window, attr, decode_mixed(buf, str));
} }