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

Make REINCARNATION unconditional.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
sys/msdos/pckeys.c
View File

@@ -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();

10
sys/msdos/vidvga.c
View File

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