pull in the recent unconditionals merge from master

This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 pckeys.c $Date$ $Revision$ */
/* NetHack 3.5 pckeys.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 pckeys.c $Date: 2009/05/06 10:49:39 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)pckeys.c 3.5 1996/05/11 */
/* Copyright (c) NetHack PC Development Team 1996 */
/* NetHack may be freely redistributed. See license for details. */
@@ -55,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();