Merge branch 'NetHack-3.6'

sys/amiga/amidos.c

@@ -210,7 +210,7 @@ const char *path, *files;
     BPTR dirLock, dirLock2;
     struct FileInfoBlock *fibp;
     int chklen;
-#ifdef BETA
+#if (NH_DEVEL_STATUS != NH_STATUS_RELEASED)
     if(files != g.alllevels)panic("eraseall");
 #endif
     chklen=(int)index(files,'*')-(int)files;

sys/unix/sysconf

@@ -110,7 +110,8 @@ MAXPLAYERS=10
 
 # 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.
+# By default PANICTRACE is enabled if (NH_DEVEL_STATUS != NH_STATUS_RELEASED),
+# 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

sys/vms/sysconf

@@ -71,7 +71,8 @@
 
 # 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.
+# By default PANICTRACE is enabled if (NH_DEVEL_STATUS != NH_STATUS_RELEASED), 
+# 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

sys/vms/vmsmain.c

@@ -415,7 +415,7 @@ genericptr_t sigargs, mechargs; /* [0] is argc, [1..argc] are the real args */
         || (condition >= SS$_ASTFLT && condition <= SS$_TBIT)
         || (condition >= SS$_ARTRES && condition <= SS$_INHCHME)) {
         g.program_state.done_hup = TRUE; /* pretend hangup has been attempted */
-#ifndef BETA
+#if (NH_DEVEL_STATUS == NH_STATUS_RELEASED)
         if (wizard)
 #endif
             abort(); /* enter the debugger */