Make REINCARNATION unconditional.

There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
This commit is contained in:
Sean Hunt
2015-02-13 23:46:47 -05:00
committed by Pasi Kallinen
parent bb647dc33c
commit ffd201495c
42 changed files with 38 additions and 273 deletions

View File

@@ -911,9 +911,7 @@ int x, y;
void mar_print_gl_char(winid,xchar,xchar,int);
#ifdef REINCARNATION
extern int mar_set_rogue(int);
#endif
extern void mar_add_pet_sign(winid,int,int);
@@ -926,9 +924,7 @@ Gem_print_glyph(window, x, y, glyph)
/* Move the cursor. */
Gem_curs(window, x,y);
# ifdef REINCARNATION
mar_set_rogue(Is_rogue_level(&u.uz) ? TRUE : FALSE);
# endif
mar_set_rogue(Is_rogue_level(&u.uz) ? TRUE : FALSE);
x--; /* MAR -- because x ranges from 1 to COLNO */
if(mar_set_tile_mode(-1)){
@@ -960,9 +956,7 @@ void mar_print_gl_char(window, x, y, glyph)
#ifdef TEXTCOLOR
/* Turn off color if rogue level. */
# ifdef REINCARNATION
if (Is_rogue_level(&u.uz)) color = NO_COLOR;
# endif
#endif /* TEXTCOLOR */
mar_print_char(window,x,y,ch,color);