From: nethack.rankin <nethack.rankin>
Date: Sat, 23 Sep 2006 04:30:45 +0000 (+0000)
Subject: build fix (trunk only)
X-Git-Tag: MOVE2GIT~890
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f4c90ca10b3adb25a7522d2c211c09eaa9542cd;p=nethack

build fix (trunk only)

     This may become moot if ASCIIGRAPH and/or ROGUE_COLOR setup changes.
But right now, the initialization was failing except when all three of
TEXTCOLOR, ASCIIGRAPH, and REINCARNATION were defined.
---

diff --git a/src/mapglyph.c b/src/mapglyph.c
index dc0473d45..941a390bc 100644
--- a/src/mapglyph.c
+++ b/src/mapglyph.c
@@ -71,8 +71,10 @@ unsigned *ospecial;
 #endif
 	uchar ch;
 	unsigned special = 0;
+#ifdef ROGUE_COLOR
 	/* condense multiple tests in macro version down to single */
 	boolean has_rogue_ibm_graphics = HAS_ROGUE_IBM_GRAPHICS;
+#endif
 
     /*
      *  Map the glyph back to a character and color.
@@ -222,7 +224,11 @@ unsigned *ospecial;
 #ifdef TEXTCOLOR
     /* Turn off color if no color defined, or rogue level w/o PC graphics. */
 # ifdef REINCARNATION
+#  ifdef ROGUE_COLOR
     if (!has_color(color) || (Is_rogue_level(&u.uz) && !has_rogue_ibm_graphics))
+#  else
+    if (!has_color(color) || Is_rogue_level(&u.uz))
+#  endif
 # else
     if (!has_color(color))
 # endif