Merge branch 'NetHack-3.6.0'

Files

@@ -182,11 +182,11 @@ linux           linux-chroot    linux-x11       macosx          macosx10.5
 macosx10.7      macosx.sh       macosx10.10     unix
 
 sys/vms:
-(files for VMS version - untested for 3.6.0)
+(files for VMS version)
 Install.vms     Makefile.dat    Makefile.doc    Makefile.src    Makefile.top
 Makefile.utl    install.com     lev_lex.h       nethack.com     oldcrtl.c
-spec_lev.com    vmsbuild.com    vmsfiles.c      vmsmail.c       vmsmain.c
-vmsmisc.c       vmstty.c        vmsunix.c
+spec_lev.com    sysconf         vmsbuild.com    vmsfiles.c      vmsmail.c
+vmsmain.c       vmsmisc.c       vmstty.c        vmsunix.c
 
 sys/wince:
 (files for Windows CE and PocketPC - untested for 3.6.0)

sys/unix/sysconf

@@ -30,12 +30,6 @@ EXPLORERS=*
 # Uses the same syntax as the WIZARDS and EXPLORERS options 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, and can be
-# overridden via DEBUGFILES environment variable.
-#DEBUGFILES=*
-
 # Limit the number of simultaneous games (see also nethack.sh).
 MAXPLAYERS=10
 
@@ -47,7 +41,7 @@ MAXPLAYERS=10
 #RECOVER=Run the recover program.
 
 # Uncomment the next line to disable the SEDUCE option, causing succubi and
-# incubi to use nypmhs' charm behavior rather than their own seduce behavior.
+# incubi to use nymphs' charm behavior rather than their own seduce behavior.
 #SEDUCE=0
 
 # Uncomment to disable savefile UID checking.
@@ -69,11 +63,19 @@ MAXPLAYERS=10
 # Maximum number of score file entries to use for random statue names
 #MAX_STATUENAME_RANK=10
 
-# Try to get more info in case of a program bug or crash.  Using GDB can
-# get more information and works on more systems but requires gdb be available;
-# using LIBC only works if NetHack is linked with a libc that supports the
-# backtrace(3) API.  Both require certain compilation options.  See
-# src/end.c and sys/unix/hints/* for more information.
+# 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, and can be
+# overridden via DEBUGFILES environment variable.
+#DEBUGFILES=*
+
+# Try to get more info in case of a program bug or crash.  Only used
+# if the program is built with the PANICTRACE compile-time option enabled.
+# By default PANICTRACE is enabled if BETA is defined, otherwise disabled.
+# Using GDB can get more information and works on more systems but requires
+# 'gdb' be available; using LIBC only works if NetHack is linked with a
+# libc that supports the backtrace(3) API.  Both require certain compilation
+# options.  See src/end.c and sys/unix/hints/* for more information.
 GDBPATH=/usr/bin/gdb
 GREPPATH=/bin/grep
 # Values are priorities: 0 - do not use this method, 1 - low priority,

sys/vms/sysconf

@@ -0,0 +1,81 @@
+# NetHack 3.6 sysconf $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
+#
+# Sample sysconf file for VMS.
+# The sysconf file is only used if NetHack is compiled with SYSCF defined.
+# It can be used to augment or override certain settings compiled into the
+# program.
+#
+# This file can also be used to set local system defaults for run-time
+# options, using the same syntax as an individual user's ./nethackrc file.
+
+# The options which take a space-separated list of usernames haven't been
+# implemented for VMS.
+#WIZARDS=
+#EXPLORERS=*
+#SHELLERS=
+
+# Limit the number of simultaneous games.  (Setting a limit has a side-effect
+# of changing the file names for the games in progress.  With no limit, they
+# are named NNNcccccc.*, when NNN is a decimal formatting of the users's UIC
+# value (group * 65536 + member; orinarily formatted as a pair of numbers
+# expressed in octal, [group,member]) and cccccc is the character name.
+# With a limit, they are named Llock.*, where L is a single letter.)
+# Limit is documented to be 25 even though 26 is easily feasible....
+#MAXPLAYERS=10
+
+# If not null, added to string "To get local support, " in the support
+# information help.
+#SUPPORT=call Izchak at extension 42.
+
+# If not null, displayed at the end of a panic-save sequence.
+#RECOVER=Run the recover program.
+
+# Uncomment the next line to disable the SEDUCE option, causing succubi and
+# incubi to use nymphs' charm behavior rather than their own seduce behavior.
+#SEDUCE=0
+
+# Uncomment to disable savefile UID checking.
+#CHECK_SAVE_UID=0
+
+# Record (high score) file options.
+# CAUTION: changing these after people have started playing games can
+#  lead to lost high scores!
+# Maximum entries for one person.
+#PERSMAX=10
+# Maximum entries in the record file.
+#ENTRYMAX=100
+# Minimum points to get an entry.
+#POINTSMIN=1
+# Determine identity of "person" in the score file with name (0) or
+# numeric (1) user id.
+#PERS_IS_UID=1
+
+# Maximum number of score file entries to use for random statue names
+#MAX_STATUENAME_RANK=10
+
+# 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, and can be
+# overridden via DEBUGFILES environment variable.
+#DEBUGFILES=*
+
+# Try to get more info in case of a program bug or crash.  Only used
+# if the program is built with the PANICTRACE compile-time option enabled.
+# By default PANICTRACE is enabled if BETA is defined, otherwise disabled.
+# (GDBPATH, GREPPATH, and PANICTRACE_LIBC aren't used on VMS.
+# PANICTRACE_GDB is repurposed, with nothing to do with 'gdb'.
+# Values are 1: show traceback and exit, 2: show traceback and
+# remain in debugger.)
+PANICTRACE_GDB=1
+#GDBPATH=
+#GREPPATH=
+#PANICTRACE_LIBC=
+#--
+
+# Ordinary run-time options can be set here to override the builtin-in
+# default values.  Unlike the SYSCF values above, individual users can
+# still choose their own option settings via NETHACKOPTIONS in their
+# environment or via sys$login:nethack.ini run-time configuration file.
+#OPTIONS=!autopickup,fruit:tomato,symset:DECgraphics
+
+#eof