From 7a1952eadd5540c6fb64719844e9948d21ea1f82 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 3 Aug 2020 22:41:35 -0400 Subject: [PATCH 1/3] more file header "NetHack 3.6" to "NetHack 3.7" --- doc/Guidebook.tex | 2 +- sys/msdos/Install.dos | 4 ++-- sys/msdos/msdoshlp.txt | 2 +- sys/winnt/porthelp | 6 +++--- win/win32/vs2017/NetHackPackage.appxmanifest | 6 +++--- win/win32/vs2017/Package.StoreAssociation.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index a2c542bd9..47b79d3c4 100644 --- a/doc/Guidebook.tex +++ b/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 diff --git a/sys/msdos/Install.dos b/sys/msdos/Install.dos index c70975b5b..ba96764a0 100644 --- a/sys/msdos/Install.dos +++ b/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) - Last revision: $NHDT-Date: 1596498267 2020/08/03 23:44:27 $ + (or, How to make PC NetHack 3.7) + 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, diff --git a/sys/msdos/msdoshlp.txt b/sys/msdos/msdoshlp.txt index cad9a17fb..441f3bb61 100644 --- a/sys/msdos/msdoshlp.txt +++ b/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. diff --git a/sys/winnt/porthelp b/sys/winnt/porthelp index 3f553739e..a251e14b5 100644 --- a/sys/winnt/porthelp +++ b/sys/winnt/porthelp @@ -1,7 +1,7 @@ - Microsoft Windows specific help file for NetHack 3.6 - Copyright (c) NetHack PC Development Team 1993-2002. + Microsoft Windows specific help file for NetHack 3.7 + 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 diff --git a/win/win32/vs2017/NetHackPackage.appxmanifest b/win/win32/vs2017/NetHackPackage.appxmanifest index 12b8d3ad1..54140a413 100644 --- a/win/win32/vs2017/NetHackPackage.appxmanifest +++ b/win/win32/vs2017/NetHackPackage.appxmanifest @@ -2,7 +2,7 @@ - NetHack 3.6 + NetHack 3.7 NetHack DevTeam Images\StoreLogo.png @@ -15,7 +15,7 @@ - + @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/win/win32/vs2017/Package.StoreAssociation.xml b/win/win32/vs2017/Package.StoreAssociation.xml index 1200895f3..24422d2fd 100644 --- a/win/win32/vs2017/Package.StoreAssociation.xml +++ b/win/win32/vs2017/Package.StoreAssociation.xml @@ -363,11 +363,11 @@ 30485NetHackDevTeam.NetHack3.6 - NetHack 3.6 + NetHack 3.7 30485NetHackDevTeam.NetHackBeta - \ No newline at end of file + From ac8bc414bca0f43d3122499cfee8e20362625806 Mon Sep 17 00:00:00 2001 From: nhw_cron Date: Mon, 3 Aug 2020 22:24:08 -0400 Subject: [PATCH 2/3] This is cron-daily v1-Jan-20-2020. files updated: Files --- Files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Files b/Files index 48c7a040b..499a00381 100644 --- a/Files +++ b/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. From ef5aeba16748e262aa92c9e4cdb625d6c24e3fc5 Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 4 Aug 2020 12:00:17 -0700 Subject: [PATCH 3/3] interface feedback by #version When there was only one supported interface included in the program, feedback of |Supported windowing system: |"tty" (traditional text with optional line-drawing) was missing the intended final period. When there were more than one, the clause describing the default could be preceded by a spurious space. |Supported windowing systems: |"tty" (traditional text with optional line-drawing) and "Qt" , with a |default of "tty". There was a fixup for " , " but it only worked as intended when that was on the last line, not when the default's text spanned lines. This adds description of "Windows GUI" to the mswin entry. X11 could have its formal name "The X Windows System" as the description but I didn't add that since it just seems like extra verbosity. Apparently Qt doesn't stand for anything else so still has no extra description. --- src/mdlib.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/mdlib.c b/src/mdlib.c index d42ee02b8..59b94b459 100644 --- a/src/mdlib.c +++ b/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), - "%s", str), *length_p += (int) strlen(str); + Sprintf(eos(optbuf), "%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) - * 3+: for, bar, and quux + * 2 : foo and bar, + * 3+: for, bar, and quux, + * + * 2+ will be followed by " with a default of..." */ - if (cnt != (winsyscnt - 1)) { - Strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */ - : (winsyscnt == 2 && cnt == 0) ? " and" - : (cnt == winsyscnt - 2) ? ", and" - : ","); - } + Strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */ + : (winsyscnt == 2 && cnt == 0) ? " 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++;