Merge branch 'NetHack-3.7' of into NetHack-3.7

Files

@@ -1,4 +1,4 @@
-This is a listing of all files in a full NetHack 3.7 distribution, organized
+This is a listing of all files in a full NetHack 3.6 distribution, organized
 in their standard manner on a UNIX system.  It indicates which files are
 necessary for which versions, so that you can tell which files may be deleted
 from or not transferred to your system if you wish.

doc/Guidebook.tex

@@ -1,5 +1,5 @@
 \documentstyle[titlepage,longtable]{article}
-% NetHack 3.6  Guidebook.tex $NHDT-Date: 1431192762 2015/12/16 17:32:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.60 $ */
+% NetHack 3.7  Guidebook.tex $NHDT-Date: 1431192762 2015/12/16 17:32:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.60 $ */
 %+% we're still limping along in LaTeX 2.09 compatibility mode
 %-%\documentclass{article}
 %-%\usepackage{hyperref} % before longtable

src/mdlib.c

@@ -1,4 +1,4 @@
-/* NetHack 3.7  mdlib.c  $NHDT-Date: 1593953352 2020/07/05 12:49:12 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.9 $ */
+/* NetHack 3.7  mdlib.c  $NHDT-Date: 1596567095 2020/08/04 18:51:35 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. */
 /* Copyright (c) M. Stephenson, 1990, 1991.                       */
@@ -63,7 +63,9 @@ static char *FDECL(bannerc_string, (char *, const char *));
 static int FDECL(case_insensitive_comp, (const char *, const char *));
 static void NDECL(make_version);
 static char *FDECL(eos, (char *));
+#if 0
 static char *FDECL(mdlib_strsubst, (char *, const char *, const char *));
+#endif
 #endif /* MAKEDEFS_C || FOR_RUNTIME */
 #if !defined(MAKEDEFS_C) && defined(WIN32)
 extern int GUILaunched;
@@ -118,6 +120,11 @@ static struct win_info window_opts[] = {
 #ifdef QT_GRAPHICS /* too vague; there are multiple incompatible versions */
     { "Qt", "Qt", TRUE },
 #endif
+#ifdef MSWIN_GRAPHICS /* win32 */
+    { "mswin", "Windows GUI", TRUE },
+#endif
+
+#if 0  /* remainder have been retired */
 #ifdef GNOME_GRAPHICS /* unmaintained/defunct */
     { "Gnome", "Gnome", TRUE },
 #endif
@@ -130,12 +137,10 @@ static struct win_info window_opts[] = {
 #ifdef GEM_GRAPHICS /* defunct Atari interface */
     { "Gem", "Gem", TRUE },
 #endif
-#ifdef MSWIN_GRAPHICS /* win32 */
-    { "mswin", "mswin", TRUE },
-#endif
 #ifdef BEOS_GRAPHICS /* unmaintained/defunct */
     { "BeOS", "BeOS InterfaceKit", TRUE },
 #endif
+#endif  /* 0 => retired */
     { 0, 0, FALSE }
 };
 
@@ -345,6 +350,7 @@ char *str;
     return str;
 }
 
+#if 0
 static char *
 mdlib_strsubst(bp, orig, replacement)
 char *bp;
@@ -363,6 +369,7 @@ const char *orig, *replacement;
     }
     return bp;
 }
+#endif
 
 static char save_bones_compat_buf[BUFSZ];
 
@@ -615,8 +622,7 @@ int *length_p; /* in/out */
         } else {
             Sprintf(eos(optbuf), " "), (*length_p)++;
         }
-        Sprintf(eos(optbuf),
+        Sprintf(eos(optbuf), "%s", str), *length_p += (int) strlen(str);
-                "%s", str), *length_p += (int) strlen(str);
         str += strlen(str) + (word ? 1 : 0);
     }
 }
@@ -694,23 +700,24 @@ build_options()
             Sprintf(eos(buf), " (%s)", window_opts[i].name);
         /*
          * 1 : foo.
-         * 2 : foo and bar  (note no period; comes from 'with default' below)
+         * 2 : foo and bar,
-         * 3+: for, bar, and quux
+         * 3+: for, bar, and quux,
+         *
+         * 2+ will be followed by " with a default of..."
          */
-        if (cnt != (winsyscnt - 1)) {
+        Strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */
-            Strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */
+                    : (winsyscnt == 2 && cnt == 0) ? " and"
-                          : (winsyscnt == 2 && cnt == 0) ? " and"
+                      : (cnt == winsyscnt - 2) ? ", and"
-                            : (cnt == winsyscnt - 2) ? ", and"
+                        : ",");
-                              : ",");
-        }
         opt_out_words(buf, &length);
         cnt++;
     }
     if (cnt > 1) {
-        Sprintf(buf, ", with a default of \"%s\".", defwinsys);
+        /* loop ended with a comma; opt_out_words() will insert a space */
+        Sprintf(buf, "with a default of \"%s\".", defwinsys);
         opt_out_words(buf, &length);
     }
-    (void) mdlib_strsubst(optbuf, " , ", ", ");
+
     opttext[idxopttext] = strdup(optbuf);
     if (idxopttext < (MAXOPT - 1))
         idxopttext++;

sys/msdos/Install.dos

@@ -5,8 +5,8 @@
               Instructions for compiling and installing
 		     NetHack 3.7 on a DOS system
          ======================================================
-                   (or, How to make PC NetHack 3.6)
+                   (or, How to make PC NetHack 3.7)
-                 Last revision: $NHDT-Date: 1596498267 2020/08/03 23:44:27 $
+        Last revision: $NHDT-Date: 1596508786 2020/08/04 02:39:46 $
 
 Credit for a runnable full PC NetHack 3.7 goes to the PC Development team
 of Paul Winner, Kevin Smolkowski, Michael Allison, Yitzhak Sapir, Bill Dyer, 

sys/msdos/msdoshlp.txt

@@ -1,4 +1,4 @@
-            MSDOS specific help file for NetHack 3.6
+            MSDOS specific help file for NetHack 3.7
 		  (Last Revision: December 4, 1999)
 
 Copyright (c) NetHack PC Development Team 1993-1999.

sys/winnt/porthelp

@@ -1,7 +1,7 @@
-        Microsoft Windows specific help file for NetHack 3.6
+        Microsoft Windows specific help file for NetHack 3.7
-        Copyright (c) NetHack PC Development Team 1993-2002.
+        Copyright (c) NetHack PC Development Team 1993-2020.
         NetHack may be freely distributed.  See license for details.
-                   (Last Revision: March 16, 2003)
+                   (Last Revision: August 8, 2020)
 
 This file details specifics for NetHack built for Windows 95, 98, NT, 
 Me, 2000, and XP. Users of really early 16-bit Windows versions should 

win/win32/vs2017/NetHackPackage.appxmanifest

@@ -2,7 +2,7 @@
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
   <Identity Name="30485NetHackDevTeam.NetHack3.6" Publisher="CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F" Version="363.0.28.0" />
   <Properties>
-    <DisplayName>NetHack 3.6</DisplayName>
+    <DisplayName>NetHack 3.7</DisplayName>
     <PublisherDisplayName>NetHack DevTeam</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
-      <uap:VisualElements DisplayName="NetHack 3.6" Description="NetHack 3.6" BackgroundColor="transparent" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png">
+      <uap:VisualElements DisplayName="NetHack 3.7" Description="NetHack 3.7" BackgroundColor="transparent" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png">
         <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square310x310Logo="Images\LargeTile.png" Square71x71Logo="Images\SmallTile.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Images\SplashScreen.png" />

win/win32/vs2017/Package.StoreAssociation.xml

@@ -363,7 +363,7 @@
   <ProductReservedInfo>
     <MainPackageIdentityName>30485NetHackDevTeam.NetHack3.6</MainPackageIdentityName>
     <ReservedNames>
-      <ReservedName>NetHack 3.6</ReservedName>
+      <ReservedName>NetHack 3.7</ReservedName>
     </ReservedNames>
   </ProductReservedInfo>
   <AccountPackageIdentityNames>