pull in the recent unconditionals merge from master
This commit is contained in:
1
sys/unix/.gitattributes
vendored
Normal file
1
sys/unix/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
Makefile.* filter=NHtext merge=NHsubst
|
||||
@@ -1,5 +1,6 @@
|
||||
# NetHack Makefile.
|
||||
# NetHack 3.5 Makefile.dat $Date$ $Revision$
|
||||
# NetHack 3.5 Makefile.dat $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.dat $Date: 2012/01/10 17:47:30 $ $Revision: 1.11 $
|
||||
|
||||
# Root of source tree:
|
||||
NHSROOT=..
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# NetHack Makefile.
|
||||
# NetHack 3.5 Makefile.doc $Date$ $Revision$
|
||||
# NetHack 3.5 Makefile.doc $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.doc $Date: 2010/05/01 23:10:22 $ $Revision: 1.11 $
|
||||
|
||||
# Root of source tree:
|
||||
NHSROOT=..
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# NetHack Makefile.
|
||||
# NetHack 3.5 Makefile.src $Date$ $Revision$
|
||||
# NetHack 3.5 Makefile.src $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.src $Date: 2012/01/20 03:41:33 $ $Revision: 1.37 $
|
||||
|
||||
# Root of source tree:
|
||||
NHSROOT=..
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# NetHack Makefile.
|
||||
# NetHack 3.5 Makefile.top $Date$ $Revision$
|
||||
# NetHack 3.5 Makefile.top $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.top $Date: 2012/01/10 17:47:30 $ $Revision: 1.19 $
|
||||
|
||||
# Root of source tree:
|
||||
NHSROOT=.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# Makefile for NetHack's utility programs.
|
||||
# NetHack 3.5 Makefile.utl $Date$ $Revision$
|
||||
# NetHack 3.5 Makefile.utl $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.utl $Date: 2012/01/10 17:47:30 $ $Revision: 1.18 $
|
||||
|
||||
# Root of source tree:
|
||||
NHSROOT=..
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
NetHack 3.5.0 Linux Elf
|
||||
|
||||
$NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
$Date: 2005/01/02 17:17:28 $ $Revision: 1.16 $
|
||||
|
||||
This README provides the instructions for using the official Linux binary,
|
||||
system platform requirements, as well as steps used to create that binary.
|
||||
The same steps can be used from the source distribution to create a similar
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# depend.awk -- awk script used to construct makefile dependencies
|
||||
# for nethack's source files (`make depend' support for Makefile.src).
|
||||
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# $Date: 2005/12/15 03:42:52 $ $Revision: 1.3 $
|
||||
#
|
||||
# usage:
|
||||
# cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files
|
||||
|
||||
1
sys/unix/hints/.gitattributes
vendored
Normal file
1
sys/unix/hints/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* filter=NHtext merge=NHsubst
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 linux $Date$ $Revision$
|
||||
# NetHack 3.5 linux $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 linux $Date: 2010/01/15 19:54:37 $ $Revision: 1.8 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 linux-x11 $Date$ $Revision$
|
||||
# NetHack 3.5 linux-x11 $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 linux-x11 $Date: 2009/12/23 20:02:29 $ $Revision: 1.5 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 macosx $Date$ $Revision$
|
||||
# NetHack 3.5 macosx $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 macosx $Date: 2009/12/23 20:02:29 $ $Revision: 1.9 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/bin/sh
|
||||
# NetHack 3.5 macosx.sh $Date$ $Revision$
|
||||
# NetHack 3.5 macosx.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 macosx.sh $Date: 2011/10/17 01:29:17 $ $Revision: 1.5 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 macosx10.5 $Date$ $Revision$
|
||||
# NetHack 3.5 macosx10.5 $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 macosx10.5 $Date: 2011/10/17 01:29:17 $ $Revision: 1.11 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 macosx10.7 $Date$ $Revision$
|
||||
# NetHack 3.5 macosx10.7 $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 macosx10.7 $Date: 2012/01/18 22:32:24 $ $Revision: 1.4 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 unix $Date$ $Revision$
|
||||
# NetHack 3.5 unix $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 unix $Date: 2009/12/23 20:02:29 $ $Revision: 1.5 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/bin/sh
|
||||
# NetHack 3.5 mkmkfile.sh $Date$ $Revision$
|
||||
# NetHack 3.5 mkmkfile.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 mkmkfile.sh $Date: 2011/12/27 00:34:52 $ $Revision: 1.5 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/bin/sh
|
||||
# NetHack 3.5 nethack.sh $Date$ $Revision$
|
||||
# NetHack 3.5 nethack.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 nethack.sh $Date: 2009/05/06 10:50:54 $ $Revision: 1.9 $
|
||||
# SCCS Id: @(#)nethack.sh 3.5 2007/12/12
|
||||
|
||||
HACKDIR=/usr/games/lib/nethackdir
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/bin/sh
|
||||
# NetHack 3.5 setup.sh $Date$ $Revision$
|
||||
# NetHack 3.5 setup.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 setup.sh $Date: 2011/12/27 00:34:52 $ $Revision: 1.6 $
|
||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||
# NetHack may be freely redistributed. See license for details.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#
|
||||
# NetHack 3.5 sysconf $Date$ $Revision$
|
||||
# NetHack 3.5 sysconf $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 sysconf $Date: 2012/01/27 20:15:31 $ $Revision: 1.6 $
|
||||
#
|
||||
# Sample sysconf file.
|
||||
# The sysconf file is only used if NetHack is compiled with SYSCF defined.
|
||||
@@ -13,6 +14,11 @@ WIZARDS=root games
|
||||
# Uses the same syntax as the WIZARDS option above.
|
||||
#SHELLERS=
|
||||
|
||||
# Show debugging information originating from these source files.
|
||||
# Use '*' for all, or list source files separated by spaces.
|
||||
# Only available if game has been compiled with DEBUG.
|
||||
#DEBUGFILES=*
|
||||
|
||||
# Limit the number of simultaneous games (see also nethack.sh).
|
||||
MAXPLAYERS=10
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 unixmain.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 unixmain.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 unixmain.c $Date: 2012/01/27 20:15:31 $ $Revision: 1.42 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -223,13 +224,10 @@ char *argv[];
|
||||
or holds a generic user name like "player" or "games" */
|
||||
plnamesuffix();
|
||||
|
||||
#ifdef WIZARD
|
||||
if (wizard) {
|
||||
/* use character name rather than lock letter for file names */
|
||||
locknum = 0;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
} else {
|
||||
/* suppress interrupts while processing lock file */
|
||||
(void) signal(SIGQUIT,SIG_IGN);
|
||||
(void) signal(SIGINT,SIG_IGN);
|
||||
@@ -359,20 +357,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;
|
||||
case 'p': /* profession (role) */
|
||||
@@ -559,12 +553,10 @@ port_help()
|
||||
boolean
|
||||
authorize_wizard_mode()
|
||||
{
|
||||
#ifdef WIZARD
|
||||
struct passwd *pw = get_unix_pw();
|
||||
if (pw && sysopt.wizards && sysopt.wizards[0]) {
|
||||
if(check_user_string(sysopt.wizards)) return TRUE;
|
||||
}
|
||||
#endif /* WIZARD */
|
||||
wiz_error_flag = TRUE; /* not being allowed into wizard mode */
|
||||
return FALSE;
|
||||
}
|
||||
@@ -573,16 +565,12 @@ static void
|
||||
wd_message()
|
||||
{
|
||||
if (wiz_error_flag) {
|
||||
#ifdef WIZARD
|
||||
if (sysopt.wizards && sysopt.wizards[0]) {
|
||||
char *tmp = build_english_list(sysopt.wizards);
|
||||
pline("Only user%s %s may access debug (wizard) mode.",
|
||||
index(sysopt.wizards, ' ')?"s":"", tmp);
|
||||
free(tmp);
|
||||
} else
|
||||
#else
|
||||
pline("Debug mode is not available.");
|
||||
#endif
|
||||
pline("Entering explore/discovery mode instead.");
|
||||
wizard = 0, discover = 1; /* (paranoia) */
|
||||
} else if (discover)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 unixres.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 unixres.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 unixres.c $Date: 2009/05/06 10:50:57 $ $Revision: 1.8 $ */
|
||||
/* SCCS Id: @(#)unixres.c 3.5 2001/07/08 */
|
||||
/* Copyright (c) Slash'EM development team, 2001. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 unixunix.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 unixunix.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 unixunix.c $Date: 2012/01/27 20:15:31 $ $Revision: 1.16 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -310,9 +311,7 @@ int wt;
|
||||
#endif
|
||||
#ifndef NO_SIGNAL
|
||||
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
|
||||
# ifdef WIZARD
|
||||
if(wizard) (void) signal(SIGQUIT,SIG_DFL);
|
||||
# endif
|
||||
#endif
|
||||
if(wt) {
|
||||
raw_print("");
|
||||
|
||||
Reference in New Issue
Block a user