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

build fix (trunk only)

Browse Source 
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.
This commit is contained in:
nethack.rankin
2006-09-23 04:30:45 +00:00
parent d66f04ab5a
commit 7f4c90ca10
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mapglyph.c
+6
View File
@@ -71,8 +71,10 @@ unsigned *ospecial;
#endif #endif
uchar ch; uchar ch;
unsigned special = 0; unsigned special = 0;
#ifdef ROGUE_COLOR
/* condense multiple tests in macro version down to single */ /* condense multiple tests in macro version down to single */
boolean has_rogue_ibm_graphics = HAS_ROGUE_IBM_GRAPHICS; boolean has_rogue_ibm_graphics = HAS_ROGUE_IBM_GRAPHICS;
#endif
/* /*
* Map the glyph back to a character and color. * Map the glyph back to a character and color.
@@ -222,7 +224,11 @@ unsigned *ospecial;
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
/* Turn off color if no color defined, or rogue level w/o PC graphics. */ /* Turn off color if no color defined, or rogue level w/o PC graphics. */
# ifdef REINCARNATION # ifdef REINCARNATION
# ifdef ROGUE_COLOR
if (!has_color(color) || (Is_rogue_level(&u.uz) && !has_rogue_ibm_graphics)) 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 # else
if (!has_color(color)) if (!has_color(color))
# endif # endif