Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-05-07 04:52:30 -04:00
516 changed files with 1024 additions and 973 deletions

View File

@@ -1,4 +1,4 @@
Instructions for installing NetHack 3.5
Instructions for installing NetHack 3.6
on a UNIX system
=======================================
NB: We are gradually replacing this process with the process documented in
@@ -109,7 +109,7 @@ the file NewInstall.unx.
Notes:
1. Save files and bones files from previous versions will not work with
NetHack 3.5. Don't bother trying to keep them.
NetHack 3.6. Don't bother trying to keep them.
2. To install an update of this version of NetHack after changing something,
type 'make update' from the main directory. If you created the new

View File

@@ -1,6 +1,6 @@
# NetHack Makefile.
# 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 $
# NetHack 3.6 Makefile.dat $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 Makefile.dat $Date: 2012/01/10 17:47:30 $ $Revision: 1.11 $
# Root of source tree:
NHSROOT=..

View File

@@ -1,6 +1,6 @@
# NetHack Makefile.
# 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 $
# NetHack 3.6 Makefile.doc $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 Makefile.doc $Date: 2010/05/01 23:10:22 $ $Revision: 1.11 $
# Root of source tree:
NHSROOT=..

View File

@@ -1,6 +1,6 @@
# NetHack Makefile.
# NetHack 3.5 Makefile.src $NHDT-Date: 1430897864 2015/05/06 07:37:44 $ $NHDT-Branch: master $:$NHDT-Revision: 1.39 $
# NetHack 3.5 Makefile.src $Date: 2012/01/20 03:41:33 $ $Revision: 1.37 $
# NetHack 3.6 Makefile.src $NHDT-Date: 1430958824 2015/05/07 00:33:44 $ $NHDT-Branch: master $:$NHDT-Revision: 1.40 $
# NetHack 3.6 Makefile.src $Date: 2012/01/20 03:41:33 $ $Revision: 1.37 $
# Root of source tree:
NHSROOT=..
@@ -627,7 +627,7 @@ wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h ../include/tcap.h
Window.o: ../win/X11/Window.c ../include/xwindowp.h ../include/xwindow.h \
$(CONFIG_H) ../include/lint.h
$(CC) $(CFLAGS) -c ../win/X11/Window.c
dialogs.o: ../win/X11/dialogs.c $(CONFIG_H)
dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) ../include/lint.h
$(CC) $(CFLAGS) -c ../win/X11/dialogs.c
winX.o: ../win/X11/winX.c $(HACK_H) ../include/winX.h ../include/dlb.h \
../win/X11/nh72icon ../win/X11/nh56icon ../win/X11/nh32icon

View File

@@ -1,6 +1,6 @@
# NetHack Makefile.
# NetHack 3.5 Makefile.top $NHDT-Date: 1428453876 2015/04/08 00:44:36 $ $NHDT-Branch: nhmall-booktribute $:$NHDT-Revision: 1.25 $
# NetHack 3.5 Makefile.top $Date: 2012/01/10 17:47:30 $ $Revision: 1.19 $
# NetHack 3.6 Makefile.top $NHDT-Date: 1428453876 2015/04/08 00:44:36 $ $NHDT-Branch: nhmall-booktribute $:$NHDT-Revision: 1.25 $
# NetHack 3.6 Makefile.top $Date: 2012/01/10 17:47:30 $ $Revision: 1.19 $
# Root of source tree:
NHSROOT=.

View File

@@ -1,6 +1,6 @@
# Makefile for NetHack's utility programs.
# NetHack 3.5 Makefile.utl $NHDT-Date: 1430639195 2015/05/03 07:46:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.19 $
# NetHack 3.5 Makefile.utl $Date: 2012/01/10 17:47:30 $ $Revision: 1.18 $
# NetHack 3.6 Makefile.utl $NHDT-Date: 1430639195 2015/05/03 07:46:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.19 $
# NetHack 3.6 Makefile.utl $Date: 2012/01/10 17:47:30 $ $Revision: 1.18 $
# Root of source tree:
NHSROOT=..

View File

@@ -1,5 +1,5 @@
Instructions for installing NetHack 3.5
Instructions for installing NetHack 3.6
using the new hints system
=======================================

View File

@@ -1,4 +1,4 @@
NetHack 3.5.0 Linux Elf
NetHack 3.6.0 Linux Elf
$NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
$Date: 2005/01/02 17:17:28 $ $Revision: 1.16 $

View File

@@ -1,6 +1,6 @@
#
# NetHack 3.5 linux $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 linux $Date: 2010/01/15 19:54:37 $ $Revision: 1.8 $
# NetHack 3.6 linux $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#
# 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 $
# NetHack 3.6 linux-x11 $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#
# NetHack 3.5 macosx $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 macosx $Date: 2009/12/23 20:02:29 $ $Revision: 1.9 $
# NetHack 3.6 macosx $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#!/bin/sh
# 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 $
# NetHack 3.6 macosx.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#
# 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 $
# NetHack 3.6 macosx10.5 $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#
# 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 $
# NetHack 3.6 macosx10.7 $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#
# NetHack 3.5 unix $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 unix $Date: 2009/12/23 20:02:29 $ $Revision: 1.5 $
# NetHack 3.6 unix $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#!/bin/sh
# 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 $
# NetHack 3.6 mkmkfile.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.

View File

@@ -1,6 +1,6 @@
#!/bin/sh
# 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 $
# NetHack 3.6 nethack.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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

View File

@@ -1,6 +1,6 @@
#!/bin/sh
# 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 $
# NetHack 3.6 setup.sh $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.
#

View File

@@ -1,6 +1,6 @@
#
# NetHack 3.5 sysconf $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 sysconf $Date: 2012/01/27 20:15:31 $ $Revision: 1.6 $
# NetHack 3.6 sysconf $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 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.

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 unixmain.c $NHDT-Date: 1427074144 2015/03/23 01:29:04 $ $NHDT-Branch: master $:$NHDT-Revision: 1.45 $ */
/* NetHack 3.6 unixmain.c $NHDT-Date: 1427074144 2015/03/23 01:29:04 $ $NHDT-Branch: master $:$NHDT-Revision: 1.45 $ */
/* NetHack 3.6 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. */

View File

@@ -1,5 +1,5 @@
/* 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 $ */
/* NetHack 3.6 unixres.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.6 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. */

View File

@@ -1,5 +1,5 @@
/* 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 $ */
/* NetHack 3.6 unixunix.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.6 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. */