pull in the recent unconditionals merge from master
This commit is contained in:
Derek S. Ray
1
sys/share/.gitattributes
vendored
Normal file
1
sys/share/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
Makefile.* filter=NHtext merge=NHsubst
|
||||
@@ -1,4 +1,5 @@
|
||||
# NetHack 3.5 Makefile.lib $Date$ $Revision$
|
||||
# NetHack 3.5 Makefile.lib $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.lib $Date: 2009/05/06 10:50:26 $ $Revision: 1.4 $
|
||||
# SCCS Id: @(#)Makefile.lib 3.5 1990/22/02
|
||||
# Nethack makefile for Fred fish termlib -- Norman Meluch
|
||||
#
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
# NetHack Copyright (c) NetHack PC Development Team 1993 - 2006
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# $Date: 2006/09/23 04:40:09 $ $Revision: 1.7 $
|
||||
#
|
||||
# A '#' at the beginning of a line means the rest of the line is a comment.
|
||||
#
|
||||
# Some options MUST be set in this file, other options can be toggled while
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 ioctl.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 ioctl.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 ioctl.c $Date: 2011/06/16 15:10:14 $ $Revision: 1.8 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 nhlan.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 nhlan.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 nhlan.c $Date: 2009/05/06 10:50:26 $ $Revision: 1.5 $ */
|
||||
/* SCCS Id: @(#)nhlan.c 3.5 1999/11/21 */
|
||||
/* Copyright (c) Michael Allison, 1997 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 pcmain.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 pcmain.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 pcmain.c $Date: 2012/01/20 03:41:31 $ $Revision: 1.48 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -302,19 +303,15 @@ char *argv[];
|
||||
process_options(argc, argv);
|
||||
#endif
|
||||
|
||||
#ifdef LOADSYMSETS
|
||||
# if defined(MSDOS) || defined(WIN32)
|
||||
#if defined(MSDOS) || defined(WIN32)
|
||||
/* Player didn't specify any symbol set so use IBM defaults */
|
||||
if (!symset[PRIMARY].name) {
|
||||
load_symset("IBMGraphics_2", PRIMARY);
|
||||
}
|
||||
# ifdef REINCARNATION
|
||||
if (!symset[ROGUESET].name) {
|
||||
load_symset("RogueEpyx", ROGUESET);
|
||||
}
|
||||
# endif
|
||||
# endif
|
||||
#endif /*LOADSYMSETS*/
|
||||
#endif
|
||||
|
||||
#ifdef MSDOS
|
||||
init_nhwindows(&argc,argv);
|
||||
@@ -537,20 +534,16 @@ char *argv[];
|
||||
case 'I':
|
||||
case 'i':
|
||||
if (!strncmpi(argv[0]+1, "IBM", 3)) {
|
||||
# ifdef LOADSYMSETS
|
||||
load_symset("IBMGraphics", PRIMARY);
|
||||
load_symset("RogueIBM", ROGUESET);
|
||||
switch_symbols(TRUE);
|
||||
# endif
|
||||
}
|
||||
break;
|
||||
/* case 'D': */
|
||||
case 'd':
|
||||
if (!strncmpi(argv[0]+1, "DEC", 3)) {
|
||||
# ifdef LOADSYMSETS
|
||||
load_symset("DECGraphics", PRIMARY);
|
||||
switch_symbols(TRUE);
|
||||
# endif
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
@@ -703,21 +696,11 @@ port_help()
|
||||
# endif /* MSDOS || WIN32 */
|
||||
#endif /* PORT_HELP */
|
||||
|
||||
/* for KR1ED config, WIZARD is 0 or 1 and WIZARD_NAME is a string;
|
||||
for usual config, WIZARD is the string; forcing WIZARD_NAME to match it
|
||||
eliminates conditional testing for which one to use in string ops */
|
||||
#ifndef KR1ED
|
||||
# undef WIZARD_NAME
|
||||
# define WIZARD_NAME WIZARD
|
||||
#endif
|
||||
|
||||
/* validate wizard mode if player has requested access to it */
|
||||
boolean
|
||||
authorize_wizard_mode()
|
||||
{
|
||||
#ifdef WIZARD
|
||||
if (!strcmp(plname, WIZARD_NAME)) return TRUE;
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 pcsys.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 pcsys.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 pcsys.c $Date: 2012/01/22 06:33:47 $ $Revision: 1.18 $ */
|
||||
/* SCCS Id: @(#)pcsys.c 3.5 2002/01/22 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -406,7 +407,7 @@ const char *str;
|
||||
#else
|
||||
msmsg("Hit <Enter> %s.", str);
|
||||
#endif
|
||||
while (Getchar() != '\n') ;
|
||||
while (pgetchar() != '\n') ;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 pctty.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 pctty.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 pctty.c $Date: 2009/05/06 10:50:30 $ $Revision: 1.6 $ */
|
||||
/* SCCS Id: @(#)pctty.c 3.5 1990/22/02
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 pcunix.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 pcunix.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 pcunix.c $Date: 2009/05/06 10:50:30 $ $Revision: 1.27 $ */
|
||||
/* SCCS Id: @(#)pcunix.c 3.5 1994/11/07 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -32,6 +32,9 @@
|
||||
* - remove useless variable `j' from srandom()
|
||||
* - cast result of pointer subtraction to long since ptrdiff_t could
|
||||
* be bigger than that and trigger warnings when assigning to long
|
||||
*
|
||||
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
* $Date: 2007/12/23 00:59:25 $ $Revision: 1.2 $
|
||||
*/
|
||||
|
||||
#include "hack.h"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 tclib.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 tclib.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 tclib.c $Date: 2009/05/06 10:50:31 $ $Revision: 1.4 $ */
|
||||
/* SCCS Id: @(#)tclib.c 3.5 1996/02/25 */
|
||||
/* Copyright (c) Robert Patrick Rankin, 1995 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 unixtty.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 unixtty.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 unixtty.c $Date: 2012/01/23 07:11:09 $ $Revision: 1.10 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -363,11 +364,9 @@ init_sco_cons()
|
||||
if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
|
||||
atexit(sco_mapon);
|
||||
sco_mapoff();
|
||||
# ifdef LOADSYMSETS
|
||||
load_symset("IBMGraphics", PRIMARY);
|
||||
load_symset("RogueIBM", ROGUESET);
|
||||
switch_symbols(TRUE);
|
||||
# endif
|
||||
# ifdef TEXTCOLOR
|
||||
if (has_colors())
|
||||
iflags.use_color = TRUE;
|
||||
|
||||
@@ -41,6 +41,8 @@
|
||||
* Modified 08 July 2006 to cast strlen() result to int to suppress a
|
||||
* warning on platforms where size_t > sizeof(int).
|
||||
*
|
||||
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
* $Date: 2006/07/09 16:42:21 $ $Revision: 1.4 $
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
|
||||
Reference in New Issue
Block a user