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.

sys/amiga/winfuncs.c

@@ -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

sys/msdos/pckeys.c

@@ -56,24 +56,16 @@ unsigned char shift;
 			vga_userpan(0);
 		break;
 	case 0x3E:	/* F4 = toggle overview mode */
-		if (iflags.tile_view && 
-		    !opening_dialog
-#ifdef REINCARNATION
-				&& !Is_rogue_level(&u.uz)
-#endif
-							) {
+		if (iflags.tile_view && !opening_dialog
+                    && !Is_rogue_level(&u.uz)) {
 			iflags.traditional_view = FALSE;
 			vga_overview(iflags.over_view ? FALSE : TRUE);
 			vga_refresh();
 		}
 		break;
 	case 0x3F:	/* F5 = toggle traditional mode */
-		if (iflags.tile_view &&
-		    !opening_dialog
-#ifdef REINCARNATION
-				&& !Is_rogue_level(&u.uz)
-#endif
-							) {
+		if (iflags.tile_view && !opening_dialog
+                        && !Is_rogue_level(&u.uz)) {
 			iflags.over_view = FALSE;
 			vga_traditional(iflags.traditional_view ? FALSE : TRUE);
 			vga_refresh();

sys/msdos/vidvga.c

@@ -1171,14 +1171,9 @@ vga_DrawCursor()
 	unsigned char first,second;
 /*	char on[2] =  {0xFF,0xFF}; */
 /*	char off[2] = {0x00,0x00}; */
-#ifdef REINCARNATION
 	boolean isrogue = Is_rogue_level(&u.uz);
 	boolean singlebyte = (isrogue || iflags.over_view
 			      || iflags.traditional_view || !inmap);
-#else
-	boolean singlebyte = (iflags.over_view
-			      || iflags.traditional_view || !inmap);
-#endif
 	int curtyp;
 
 	if (!cursor_type && inmap) return;	/* CURSOR_INVIS - nothing to do */
@@ -1376,14 +1371,9 @@ vga_HideCursor()
 	int i,pixx,pixy,x,y;
 	char __far *tmp1;
 	char __far *tmp2;
-#ifdef REINCARNATION
 	boolean isrogue = Is_rogue_level(&u.uz);
 	boolean singlebyte = (isrogue || iflags.over_view
 			      || iflags.traditional_view || !inmap);
-#else
-	boolean singlebyte = (iflags.over_view
-			      || iflags.traditional_view || !inmap);
-#endif
 	int curtyp;
 	
 	if (inmap && !cursor_type) return;	/* CURSOR_INVIS - nothing to do */

sys/share/pcmain.c

@@ -309,11 +309,9 @@ char *argv[];
 	if (!symset[PRIMARY].name) {
 		load_symset("IBMGraphics_2", PRIMARY);
 	}
-#  ifdef REINCARNATION
 	if (!symset[ROGUESET].name) {
 		load_symset("RogueEpyx", ROGUESET);
 	}
-#  endif
 # endif
 #endif /*LOADSYMSETS*/
 

sys/wince/mhmain.c

@@ -1053,9 +1053,7 @@ void mswin_select_map_mode(int mode)
 #endif
 
 	/* override for Rogue level */
-#ifdef REINCARNATION
     if( Is_rogue_level(&u.uz) && !IS_MAP_ASCII(mode) ) return;
-#endif
 
 	/* set map mode menu mark */
 	if( IS_MAP_ASCII(mode) ) {

sys/wince/mhmap.c

@@ -569,12 +569,8 @@ void onPaint(HWND hWnd)
 		paint_rt.right = min(data->xPos + (ps.rcPaint.right - data->map_orig.x)/data->xScrTile+1, COLNO);
 		paint_rt.bottom = min(data->yPos + (ps.rcPaint.bottom - data->map_orig.y)/data->yScrTile+1, ROWNO);
 
-		if( data->bAsciiMode
-#ifdef REINCARNATION
-		    || Is_rogue_level(&u.uz) 
+		if(data->bAsciiMode || Is_rogue_level(&u.uz)) {
 			/* You enter a VERY primitive world! */
-#endif
-			) {
 			HGDIOBJ oldFont;
 
 			oldFont = SelectObject(hDC, data->hMapFont);

sys/wince/mswproc.c

@@ -793,14 +793,12 @@ void mswin_clear_nhwindow(winid wid)
         (wid < MAXWINDOWS) &&
         (GetNHApp()->windowlist[wid].win != NULL))
     {
-#ifdef REINCARNATION
 		if( GetNHApp()->windowlist[wid].type == NHW_MAP ) {
 			if( Is_rogue_level(&u.uz) ) 
 				mswin_map_mode(mswin_hwnd_from_winid(WIN_MAP), ROGUE_LEVEL_MAP_MODE);
 			else 
 				mswin_map_mode(mswin_hwnd_from_winid(WIN_MAP), iflags.wc_map_mode);
 		}
-#endif
 
          SendMessage( 
 			 GetNHApp()->windowlist[wid].win,