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

4
sys/msdos/.gitattributes vendored Normal file
View File

@@ -0,0 +1,4 @@
*.BC filter=NHtext merge=NHsubst
*.bat filter=NHtext merge=NHsubst
Makefile.* filter=NHtext merge=NHsubst
Install.* filter=NHtext merge=NHsubst

View File

@@ -7,7 +7,8 @@
NetHack 3.5 on a DOS system
======================================================
(or, How to make PC NetHack 3.5)
Last revision: $Date$
Last revision: $NHDT-Date$
Last revision: $Date: 2005/01/02 17:16:53 $
Credit for a runnable full PC NetHack 3.5 goes to the PC Development team
of Paul Winner, Kevin Smolkowski, Michael Allison, Yitzhak Sapir, Bill Dyer,

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Makefile.BC $Date$ $Revision$
# NetHack 3.5 Makefile.BC $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Makefile.BC $Date: 2012/01/10 17:47:26 $ $Revision: 1.14 $
# Copyright (c) Yitzhak Sapir, 1999-2006.
# NetHack may be freely distributed. See license for details.
#

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Makefile.GCC $Date$ $Revision$
# NetHack 3.5 Makefile.GCC $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Makefile.GCC $Date: 2012/01/10 17:47:26 $ $Revision: 1.25 $
# Copyright (c) NetHack PC Development Team 1996-2006.
# PC NetHack 3.5 Makefile for djgpp V2
#

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Makefile.MSC $Date$ $Revision$
# NetHack 3.5 Makefile.MSC $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Makefile.MSC $Date: 2012/01/22 06:27:07 $ $Revision: 1.18 $
# Copyright (c) NetHack PC Development Team 1997 - 2012.
# PC NetHack 3.4x Makefile for MSC V1.52c (16 bit compiler)
#

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 msdos.c $Date$ $Revision$ */
/* NetHack 3.5 msdos.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 msdos.c $Date: 2012/01/22 06:27:07 $ $Revision: 1.7 $ */
/* Copyright (c) NetHack PC Development Team 1990 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 ovlinit.c $Date$ $Revision$ */
/* NetHack 3.5 ovlinit.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 ovlinit.c $Date: 2009/05/06 10:49:38 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)ovlinit.c 3.5 1994/03/20 */
/* Copyright (c) NetHack PC Development Team 1995 */
/* NetHack may be freely redistributed. See license for details. */

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

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 pctiles.c $Date$ $Revision$ */
/* NetHack 3.5 pctiles.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 pctiles.c $Date: 2009/05/06 10:49:39 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)pctiles.c 3.5 1995/07/31 */
/* Copyright (c) NetHack PC Development Team 1993, 1994 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 pctiles.h $Date$ $Revision$ */
/* NetHack 3.5 pctiles.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 pctiles.h $Date: 2009/05/06 10:49:40 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)pctiles.h 3.5 1994/04/04 */
/* Copyright (c) NetHack PC Development Team 1993, 1994 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 pcvideo.h $Date$ $Revision$ */
/* NetHack 3.5 pcvideo.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 pcvideo.h $Date: 2009/05/06 10:49:40 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)pcvideo.h 3.5 1994/06/07 */
/* Copyright (c) NetHack PC Development Team 1993, 1994 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 portio.h $Date$ $Revision$ */
/* NetHack 3.5 portio.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 portio.h $Date: 2009/05/06 10:49:41 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)portio.h 3.5 1995/08/05 */
/* Copyright (c) NetHack PC Development Team 1995 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 schema1.BC $Date$ $Revision$ */
/* NetHack 3.5 schema1.BC $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 schema1.BC $Date: 2009/05/06 10:49:41 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)schema1.BC 3.5 2008/01/30 */
/* Copyright (c) Yitzhak Sapir, 1999 */
/* */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 schema2.BC $Date$ $Revision$ */
/* NetHack 3.5 schema2.BC $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 schema2.BC $Date: 2009/05/06 10:49:42 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)schema2.BC 3.5 2008/01/30 */
/* Copyright (c) Yitzhak Sapir, 1999 */
/* */

View File

@@ -1,5 +1,6 @@
@echo off
REM NetHack 3.5 setup.bat $Date$ $Revision$
REM NetHack 3.5 setup.bat $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
REM NetHack 3.5 setup.bat $Date: 2012/01/22 06:27:07 $ $Revision: 1.3 $
REM Copyright (c) NetHack PC Development Team 1990 - 2012
REM NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 sound.c $Date$ $Revision$ */
/* NetHack 3.5 sound.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 sound.c $Date: 2009/05/06 10:49:43 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)sound.c 3.5 1996/02/19 */
/* Copyright (c) NetHack PC Development Team 1993,1995 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 tile2bin.c $Date$ $Revision$ */
/* NetHack 3.5 tile2bin.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 tile2bin.c $Date: 2009/05/06 10:49:47 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)tile2bin.c 3.5 1995/01/26 */
/* Copyright (c) NetHack PC Development Team 1993, 1994, 1995 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 video.c $Date$ $Revision$ */
/* NetHack 3.5 video.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 video.c $Date: 2009/05/06 10:49:49 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)video.c 3.5 2001/04/07 */
/* Copyright (c) NetHack PC Development Team 1993, 1994, 2001 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 vidtxt.c $Date$ $Revision$ */
/* NetHack 3.5 vidtxt.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 vidtxt.c $Date: 2009/05/06 10:49:49 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)vidtxt.c 3.5 1994/04/04 */
/* Copyright (c) NetHack PC Development Team 1993 */
/* NetHack may be freely redistributed. See license for details. */

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 vidvga.c $Date$ $Revision$ */
/* NetHack 3.5 vidvga.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 vidvga.c $Date: 2009/05/06 10:49:50 $ $Revision: 1.9 $ */
/* SCCS Id: @(#)vidvga.c 3.5 2006/07/08 */
/* Copyright (c) NetHack PC Development Team 1995 */
/* NetHack may be freely redistributed. See license for details. */
@@ -1170,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 */
@@ -1375,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 */