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

@@ -2081,12 +2081,7 @@ if(u.uz.dlevel != x){
}
}
#endif
if(
WINVERS_AMIV
#ifdef REINCARNATION
&& !Is_rogue_level(&u.uz)
#endif
)
if(WINVERS_AMIV && !Is_rogue_level(&u.uz))
{
amii_curs(win,x,y);
amiga_print_glyph(win,0,glyph);
@@ -2095,7 +2090,6 @@ if(u.uz.dlevel != x){
{
/* map glyph to character and color */
(void) mapglyph(glyph, &och, &color, &special, x, y);
/* XXX next if should be ifdef REINCARNATION */
ch = (uchar)och;
if( WINVERS_AMIV ){ /* implies Rogue level here */
amii_curs(win,x,y);
@@ -2106,10 +2100,8 @@ if(u.uz.dlevel != x){
#ifdef TEXTCOLOR
/* Turn off color if rogue level. */
# ifdef REINCARNATION
if (Is_rogue_level(&u.uz))
color = NO_COLOR;
# endif
amiga_print_glyph(win,color,ch);
#else