diff --git a/src/windows.c b/src/windows.c index 89d1cd7fa..1b26ccc67 100644 --- a/src/windows.c +++ b/src/windows.c @@ -1170,7 +1170,7 @@ boolean fullsubs; /* True -> full substitution for file name, False -> else Strcpy(tmpbuf, "{current date+time}"); break; - case 'v': /* version, eg. "3.6.5-0" */ + case 'v': /* version, eg. "3.7.0-0" */ Sprintf(tmpbuf, "%s", version_string(verbuf)); break; case 'u': /* UID */ diff --git a/sys/atari/.gitattributes b/sys/atari/.gitattributes index 1e69c8203..db7b27210 100644 --- a/sys/atari/.gitattributes +++ b/sys/atari/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_Atari_version_-_untested_for_3.6.5) +* NH_filestag=(file%s_for_Atari_version_-_untested_for_3.7) diff --git a/sys/be/.gitattributes b/sys/be/.gitattributes index cfd3b0752..38ec7931e 100644 --- a/sys/be/.gitattributes +++ b/sys/be/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_BeOS_version_-_untested_for_3.6.5) +* NH_filestag=(file%s_for_BeOS_version_-_untested_for_3.7) diff --git a/sys/os2/.gitattributes b/sys/os2/.gitattributes index 79916bd77..4041868ff 100644 --- a/sys/os2/.gitattributes +++ b/sys/os2/.gitattributes @@ -1,2 +1,2 @@ Makefile.* NHSUBST -* NH_filestag=(file%s_for_OS/2_version_-_untested_for_3.6.5) +* NH_filestag=(file%s_for_OS/2_version_-_untested_for_3.7) diff --git a/sys/share/.gitattributes b/sys/share/.gitattributes index 6a04d25b3..2c54f8378 100644 --- a/sys/share/.gitattributes +++ b/sys/share/.gitattributes @@ -5,16 +5,16 @@ dgn_comp.h NH_header=no lev_comp.h NH_header=no Makefile.lib NH_header=no -Makefile.lib NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.5) -#termcap.uu NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.5) +Makefile.lib NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.7) +#termcap.uu NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.7) termcap.uu NH_filestag=>Makefile.lib -pcmain.c NH_filestag=(file_for_MSDOS,_OS/2,_Amiga,_and_Atari_versions_-_untested_for_3.6.5) +pcmain.c NH_filestag=(file_for_MSDOS,_OS/2,_Amiga,_and_Atari_versions_-_untested_for_3.7) -pcsys.c NH_filestag=(file%s_for_MSDOS,_OS/2_and_Atari_versions_-_tested_on_MSDOS_for_3.6.5_via_partial_cross-compile_only) +pcsys.c NH_filestag=(file%s_for_MSDOS,_OS/2_and_Atari_versions_-_tested_on_MSDOS_for_3.7_via_partial_cross-compile_only) pcunix.c NH_filestag=>pcsys.c -NetHack.cnf NH_filestag=(file_for_MSDOS,_OS/2,_and_Atari_versions_-_untested_for_3.6.5) +NetHack.cnf NH_filestag=(file_for_MSDOS,_OS/2,_and_Atari_versions_-_untested_for_3.7) pctty.c NH_filestag=>NetHack.cnf ioctl.c NH_filestag=(file%s_for_UNIX_and_Be_versions) diff --git a/sys/unix/sysconf b/sys/unix/sysconf index 9b2075dbc..c42a164a9 100644 --- a/sys/unix/sysconf +++ b/sys/unix/sysconf @@ -95,7 +95,7 @@ MAXPLAYERS=10 # Only available if NetHack was compiled with DUMPLOG # Allows following placeholders: # %% literal '%' -# %v version (eg. "3.6.5-0") +# %v version (eg. "3.7.0-0") # %u game UID # %t game start time, UNIX timestamp format # %T current time, UNIX timestamp format diff --git a/sys/wince/.gitattributes b/sys/wince/.gitattributes index 5939c3e4c..0742a1d02 100644 --- a/sys/wince/.gitattributes +++ b/sys/wince/.gitattributes @@ -1,4 +1,4 @@ *.ce NHSUBST *.mak NHSUBST *.bat NHSUBST -* NH_filestag=(file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.5) +* NH_filestag=(file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.7) diff --git a/sys/wince/ceinc/.gitattributes b/sys/wince/ceinc/.gitattributes index e22da34ef..26a22a17d 100644 --- a/sys/wince/ceinc/.gitattributes +++ b/sys/wince/ceinc/.gitattributes @@ -1 +1 @@ -* NH_filestag=(header_file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.5) +* NH_filestag=(header_file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.7) diff --git a/sys/wince/winhack.rc b/sys/wince/winhack.rc index a844d5b2c..504cc228e 100644 --- a/sys/wince/winhack.rc +++ b/sys/wince/winhack.rc @@ -284,8 +284,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,5,0 - PRODUCTVERSION 3,6,5,0 + FILEVERSION 3,7,0,0 + PRODUCTVERSION 3,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -300,17 +300,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "NetHack 3.6.5 for Windows CE\0" + VALUE "Comments", "NetHack 3.7.0 for Windows CE\0" VALUE "CompanyName", " \0" VALUE "FileDescription", "nethackm\0" - VALUE "FileVersion", "3, 6, 5, 0\0" + VALUE "FileVersion", "3, 7, 0, 0\0" VALUE "InternalName", "nethackm\0" VALUE "LegalCopyright", "Copyright © 1985-2020\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nethackm.exe\0" VALUE "PrivateBuild", "090914\0" VALUE "ProductName", "NetHack\0" - VALUE "ProductVersion", "3, 6, 5, 0\0" + VALUE "ProductVersion", "3, 7, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/sys/wince/winhcksp.rc b/sys/wince/winhcksp.rc index 377c8e6da..959fba59c 100644 --- a/sys/wince/winhcksp.rc +++ b/sys/wince/winhcksp.rc @@ -260,8 +260,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,5,0 - PRODUCTVERSION 3,6,5,0 + FILEVERSION 3,7,0,0 + PRODUCTVERSION 3,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -276,17 +276,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "NetHack 3.6.5 for Smartphone 2002\0" + VALUE "Comments", "NetHack 3.7.0 for Smartphone 2002\0" VALUE "CompanyName", " \0" VALUE "FileDescription", "nethackm\0" - VALUE "FileVersion", "3, 6, 5, 0\0" + VALUE "FileVersion", "3, 7, 0, 0\0" VALUE "InternalName", "nethackm\0" VALUE "LegalCopyright", "Copyright © 1985-2020\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nethackm.exe\0" VALUE "PrivateBuild", "090914\0" VALUE "ProductName", "NetHack For Smartphone\0" - VALUE "ProductVersion", "3, 6, 5, 0\0" + VALUE "ProductVersion", "3, 7, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 2c50a4ed2..4eb5d1348 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -1,8 +1,8 @@ - Copyright (c) NetHack Development Team 1990-2019 + Copyright (c) NetHack Development Team 1990-2020 NetHack may be freely redistributed. See license for details. ============================================================== Instructions for compiling and installing - NetHack 3.6 on a Windows system + NetHack 3.7 on a Windows system (Windows 7/8.x/10 or later only) ============================================================== Last revision: $NHDT-Date: 1575245156 2019/12/02 00:05:56 $ @@ -16,7 +16,7 @@ contributed the port. Alex Kompel, Dion Nicolaas, Yitzhak Sapir, Derek S. Ray, Michael Allison, Pasi Kallinen, Bart House, and Janet Walz contributed to the maintainance -of the tty and graphical windows versions of NetHack 3.6.5. +of the tty and graphical windows versions of NetHack 3.7.0. You can build a TTY version of NetHack and a Windows Graphical version. You can use one of the following build environments: @@ -26,7 +26,7 @@ version. You can use one of the following build environments: OR - o (Untested for 3.6) A copy of MinGW. MinGW is a collection of header + o (Untested for 3.7) A copy of MinGW. MinGW is a collection of header files and import libraries with which native Windows32 programs can be built; the MinGW distribution contains the GNU Compiler Collection. You can download MinGW at @@ -39,17 +39,17 @@ version. You can use one of the following build environments: \---------------------------------------------/ - (NetHack-top) ----------------------(optional-pdcurses-top) - | | - ---------------------------------------------- -------------- - | | | | | | | | | - util dat doc include src sys win pdcurses wincon - | | - ------ -------- - | | | | - share winnt tty win32 + (NetHack-top) + | + +-----+-----+------+------+-----+----------+---------~---------+ + | | | | | | | | + util dat doc include src sys win lib (external) + | | | + +----+ +------+ +-----------+ + | | | | | | + share winnt tty win32 Lua-5.3.5 pdcurses | - vs2017 + vs2017 /--------------------------------------------------------\ @@ -151,7 +151,7 @@ a 32-bit x86 version, or a 64-bit x64 version. The default Makefile is set up for a 32-bit x86 version, but that's only because it will run on the most number of existing Windows environments. -NetHack's save files and bones files in the 3.6.5 release have not yet +NetHack's save files and bones files in the 3.7.0 release have not yet evolved enough to allow them to interchange between the 32-bit version and the 64-bit version (or between different platforms). Hopefully that will change in an upcoming release. diff --git a/sys/winnt/nethack.def b/sys/winnt/nethack.def index 91adc4ec0..3bb31c60a 100644 --- a/sys/winnt/nethack.def +++ b/sys/winnt/nethack.def @@ -1,5 +1,5 @@ NAME NETHACK -DESCRIPTION 'NetHack 3.6.5 for Windows' +DESCRIPTION 'NetHack 3.7.0 for Windows' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/win/gem/.gitattributes b/win/gem/.gitattributes index f39d64117..303f8dfcc 100644 --- a/win/gem/.gitattributes +++ b/win/gem/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_GEM_versions_-_untested_for_3.6.5) +* NH_filestag=(file%s_for_GEM_versions_-_untested_for_3.7) diff --git a/win/gnome/.gitattributes b/win/gnome/.gitattributes index 11c09ee8a..b5ad839b8 100644 --- a/win/gnome/.gitattributes +++ b/win/gnome/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_GNOME_versions_-_untested_for_3.6.5) +* NH_filestag=(file%s_for_GNOME_versions_-_untested_for_3.7) diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index 2c2153735..b4df786f8 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -2318,7 +2318,7 @@ logDebug(const char *fmt, ...) /* Reading and writing settings from the registry. */ #define CATEGORYKEY "Software" #define COMPANYKEY "NetHack" -#define PRODUCTKEY "NetHack 3.6.5" +#define PRODUCTKEY "NetHack 3.7.0" #define SETTINGSKEY "Settings" #define MAINSHOWSTATEKEY "MainShowState" #define MAINMINXKEY "MainMinX"