From 2b66b5ecd16f7a3667a3362d6e4240d8622fedd6 Mon Sep 17 00:00:00 2001 From: nhmall Date: Wed, 16 May 2018 23:06:44 -0400 Subject: [PATCH] bump version ID values --- Files | 30 +++++++++---------- README | 40 ++++++++----------------- doc/Guidebook.mn | 4 +-- doc/Guidebook.tex | 2 +- doc/fixes36.2 | 4 +-- include/config.h | 2 +- include/flag.h | 2 +- src/windows.c | 2 +- sys/unix/README.linux | 4 +-- sys/vms/Install.vms | 6 ++-- sys/vms/Makefile.src | 2 +- sys/vms/vmsbuild.com | 2 +- sys/wince/winhack.rc | 8 ++--- sys/wince/winhcksp.rc | 6 ++-- sys/winnt/Install.nt | 4 +-- sys/winnt/console.rc | 8 ++--- sys/winnt/nethack.def | 2 +- sys/winnt/sysconf | 2 +- win/macosx/NetHackGuidebook.applescript | 2 +- win/macosx/NetHackTerm.applescript | 2 +- win/win32/mswproc.c | 2 +- win/win32/nethack.rc | 8 ++--- 22 files changed, 64 insertions(+), 80 deletions(-) diff --git a/Files b/Files index 0e6674eec..732c5575c 100644 --- a/Files +++ b/Files @@ -87,7 +87,7 @@ wield.c windows.c wizard.c worm.c worn.c write.c zap.c sys/amiga: -(files for Amiga versions - untested for 3.6.1) +(files for Amiga versions - untested for 3.6.2) Build.ami Install.ami Makefile.agc Makefile.ami NetHack.cnf amidos.c amidos.p amifont.uu amifont8.uu amigst.c amii.hlp amimenu.c amirip.c amisnd.c amistack.c @@ -98,16 +98,16 @@ winfuncs.c winkey.c winmenu.c winproto.h winreq.c winstr.c xpm2iff.c sys/atari: -(files for Atari version - untested for 3.6.1) +(files for Atari version - untested for 3.6.2) Install.tos atarifnt.uue nethack.mnu setup.g tos.c unx2atar.sed sys/be: -(files for BeOS version - untested for 3.6.1) +(files for BeOS version - untested for 3.6.2) README bemain.c sys/mac: -(files for Macintosh versions) +(files for 68K Macintosh versions) Files.r Install.mw MacHelp NHDeflts NHrsrc.hqx NHsound.hqx News README carbon.plist dprintf.c maccurs.c macerrs.c macfile.c machelp.hqx macmain.c @@ -116,7 +116,7 @@ macwin.c mgetline.c mmodal.c mrecover.c mrecover.hqx mttymain.c sys/msdos: -(files for MSDOS version - untested for 3.6.1) +(files for MSDOS version - untested for 3.6.2) Install.dos Makefile.BC Makefile.GCC Makefile.MSC moveinit.pat msdos.c msdoshlp.txt ovlinit.c pckeys.c pctiles.c pctiles.h pcvideo.h portio.h schema1.BC schema2.BC @@ -126,17 +126,17 @@ vesa.h video.c vidtxt.c vidvesa.c vidvga.c nhico.uu nhpif.uu sys/os2: -(files for OS/2 version - untested for 3.6.1) +(files for OS/2 version - untested for 3.6.2) Install.os2 Makefile.os2 nhpmico.uu os2.c sys/share: -(files for MSDOS and OS/2 versions - untested for 3.6.1) +(files for MSDOS and OS/2 versions - untested for 3.6.2) Makefile.lib termcap.uu -(file for MSDOS, OS/2, NT, Amiga, and Atari versions - untested for 3.6.1) +(file for MSDOS, OS/2, NT, Amiga, and Atari versions - untested for 3.6.2) pcmain.c -(files for MSDOS, OS/2, NT, and Atari versions - untested for 3.6.1) +(files for MSDOS, OS/2, NT, and Atari versions - untested for 3.6.2) pcsys.c pcunix.c -(file for MSDOS, OS/2, and Atari versions - untested for 3.6.1) +(file for MSDOS, OS/2, and Atari versions - untested for 3.6.2) NetHack.cnf pctty.c (files for UNIX and Be versions) ioctl.c unixtty.c @@ -191,7 +191,7 @@ 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.1) +(files for Windows CE and PocketPC - untested for 3.6.2) Install.ce bootstrp.mak celib.c cesetup.bat cesound.c defaults.nh keypad.uu menubar.uu mhaskyn.c mhaskyn.h mhcmd.c mhcmd.h mhcolor.c mhcolor.h mhdlg.c @@ -204,11 +204,11 @@ resource.h winMS.h winhack.c winhack.rc winhcksp.rc winmain.c sys/wince/ceinc: -(header files for Windows CE and PocketPC - untested for 3.6.1) +(header files for Windows CE and PocketPC - untested for 3.6.2) assert.h errno.h fcntl.h sys/wince/ceinc/sys: -(sys/stat.h for Windows CE and PocketPC - untested for 3.6.1) +(sys/stat.h for Windows CE and PocketPC - untested for 3.6.2) stat.h sys/winnt: @@ -257,13 +257,13 @@ win/chain: wc_chainin.c wc_chainout.c wc_trace.c win/gem: -(files for GEM versions - untested for 3.6.1) +(files for GEM versions - untested for 3.6.2) Install.gem bitmfile.c gem_rsc.uu gem_rso.uu gr_rect.c gr_rect.h load_img.c tile2img.c title.uu wingem.c wingem1.c xpm2img.c win/gnome: -(files for GNOME versions - untested for 3.6.1) +(files for GNOME versions - untested for 3.6.2) README gn_xpms.h gnaskstr.c gnaskstr.h gnbind.c gnbind.h gnglyph.c gnglyph.h gnmain.c gnmain.h gnmap.c gnmap.h gnmenu.c gnmenu.h gnmesg.c diff --git a/README b/README index 70545da1c..391b975fc 100644 --- a/README +++ b/README @@ -1,39 +1,23 @@ - NetHack 3.6.1 -- General information + NetHack 3.6.2 -- General information NetHack 3.6 is an enhancement to the dungeon exploration game NetHack, which is a distant descendent of Rogue and Hack, and a direct descendent of NetHack 3.4 as there was no NetHack 3.5 release. -NetHack 3.6.1 contains over 470 bug fixes to NetHack 3.6.0. The -file doc/fixes36.1 in the source distribution has a full list of them. -The text in there was written for the development team's own use and is -provided "as is", so please do not ask us to further explain the entries -in that file. Some entries might be considered "spoilers", particularly -in the "new features" section. +NetHack 3.6.2 contains a collection of more than 15 bug fixes to NetHack 3.6.1. +The file doc/fixes36.2 in the source distribution has a full list of them. The +text in there was written for the development team's own use and is provided +"as is", so please do not ask us to further explain the entries in that file. +Some entries might be considered "spoilers", particularly in the "new features" +section. Below you will find some other general notes that were not considered spoilers: -* additional Terry Pratchett tribute passages -* enhanced map position picking -* new status line conditions Stone Strngl Deaf Lev Fly Ride -* updated status hilites and several interface enhancements -* new paranoid_confirm settings -* a new extended command #kick -* the vanquished monsters list can be sorted during end of game disclosure -* fountains are bright blue -* travel accepts 'm' (request menu) prefix -* pressing a or A when cursor positioning shows menu of "interesting" features -* pressing z or Z when cursor positioning can cycle through valid locations -* add option herecmd_menu to make a mouse click on your character pop up a menu -* #adjust's behavior altered when collecting compatible stacks -* Some community patches that were included: - - Malcolm Ryan's improved tin opener - - Ray Chason's MSDOS port support for some VESA modes - - Ray Chason's Qt4 windowport - - Darshan Shaligram's pet ranged attack - - Jason Dorje Short's key rebinding - - Maxime Bacoux's new DUMPLOG -* updated database entries for several things +* Performance optimizations with tty including the ability to do per field + updating +* sys/winnt/nttty performance improvements mainly through the introduction + of a back buffer approach +* a couple of windows crash bug fixes - - - - - - - - - - - diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 9b21196d7..8e84445b0 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -21,7 +21,7 @@ .ds vr "NetHack 3.6 .ds f0 "\*(vr .ds f1 -.ds f2 "April 27, 2018 +.ds f2 "May 16, 2018 . .\" labeled paragraph start (should be part of tmac.n, but I don't want to .\" make changes to that file) @@ -4181,7 +4181,7 @@ if your game is compiled with DUMPLOG. Allows the following placeholders: .PL %% literal '%' .PL %v -version (eg. "3.6.1-0") +version (eg. "3.6.2-0") .PL %u game UID .PL %t diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 2cbc606bb..afea69057 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -4851,7 +4851,7 @@ if your game is compiled with DUMPLOG. Allows the following placeholders: %.sd %.si {\tt \%\%} --- literal `{\tt \%}'\\ -{\tt \%v} --- version (eg. "3.6.1-0")\\ +{\tt \%v} --- version (eg. "3.6.2-0")\\ {\tt \%u} --- game UID\\ {\tt \%t} --- game start time, UNIX timestamp format\\ {\tt \%T} --- current time, UNIX timestamp format\\ diff --git a/doc/fixes36.2 b/doc/fixes36.2 index 49341e504..4c54efb8b 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -2,8 +2,8 @@ $NHDT-Branch: $:$NHDT-Revision: $ $NHDT-Date: $ This fixes36.2 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.1 in April 2018. Please note, however, -that another 3.6.x release is not anticipated, and most developer focus will -shift to the next major release. +that another 3.6.x release is not anticipated after 3.6.2, and most developer +focus will shift to the next major release. General Fixes and Modified Features ----------------------------------- diff --git a/include/config.h b/include/config.h index 828131ecd..ef6d0e534 100644 --- a/include/config.h +++ b/include/config.h @@ -531,7 +531,7 @@ typedef unsigned char uchar; #define DUMPLOG_FILE "/tmp/nethack.%n.%d.log" /* DUMPLOG_FILE allows following placeholders: %% literal '%' - %v version (eg. "3.6.1-0") + %v version (eg. "3.6.2-0") %u game UID %t game start time, UNIX timestamp format %T current time, UNIX timestamp format diff --git a/include/flag.h b/include/flag.h index 277b42cfe..8d386decf 100644 --- a/include/flag.h +++ b/include/flag.h @@ -64,7 +64,7 @@ struct flag { * 'schar' to 'short int' instead of to 'char'. (Needed by pre-ANSI * systems that use unsigned characters without a way to force them * to be signed.) So, the type has been changed back to 'xchar' for - * 3.6.1. + * 3.6.x. * * TODO: change to 'char' (and move out of this block of booleans, * and get rid of these comments...) once 3.6.0 savefile compatibility diff --git a/src/windows.c b/src/windows.c index 7a62582e6..9a82325d9 100644 --- a/src/windows.c +++ b/src/windows.c @@ -1091,7 +1091,7 @@ char *buf; case 'D': /* current time, YYYYMMDDhhmmss */ Sprintf(tmpbuf, "%08ld%06ld", yyyymmdd(now), hhmmss(now)); break; - case 'v': /* version, eg. "3.6.1-0" */ + case 'v': /* version, eg. "3.6.2-0" */ Sprintf(tmpbuf, "%s", version_string(verbuf)); break; case 'u': /* UID */ diff --git a/sys/unix/README.linux b/sys/unix/README.linux index 01b79265d..ec28d1000 100644 --- a/sys/unix/README.linux +++ b/sys/unix/README.linux @@ -26,8 +26,8 @@ home directory you might perform these steps. If you have old record and logfile entries from a previous NetHack version, you might want to save copies before they get overwritten by the new empty -files; old saved games and bones files from 3.6.0 should work with 3.6.1 -but even older saved games and bones files from 3.4.3 will not. +files; old saved games and bones files from 3.6.0 and 3.6.1 should work +with 3.6.2 but even older saved games and bones files from 3.4.3 will not. If you are installing from the RPM, there is no need to save the old record and logfile; they are automatically preserved. diff --git a/sys/vms/Install.vms b/sys/vms/Install.vms index e917aefdf..dab086cda 100644 --- a/sys/vms/Install.vms +++ b/sys/vms/Install.vms @@ -1,4 +1,4 @@ - Instructions for Building and Installing NetHack 3.6.1 + Instructions for Building and Installing NetHack 3.6.2 on a VMS (aka OpenVMS) system ========================================= @@ -137,8 +137,8 @@ Notes: 0. Version 3.5.x was never publicly released. 1. Save files and bones files from 3.4.x and earlier versions - will not work with 3.6.1, but save files and bones file from 3.6.0 - should work. The scoreboard file (RECORD) from 3.6.0 or + will not work with 3.6.2, but save files and bones file from 3.6.0 + and 3.6.1 should work. The scoreboard file (RECORD) from 3.6.0 or 3.4.x or 3.3.x will work. 2. To specify user-preference options in your environment, define the diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src index 1fee34ae7..e3cabd5c7 100644 --- a/sys/vms/Makefile.src +++ b/sys/vms/Makefile.src @@ -99,7 +99,7 @@ RANDOBJ = random.obj # Other things that have to be reconfigured are in vmsconf.h, # and config.h -VERSION = 3.6.1 +VERSION = 3.6.2 MAKEDEFS = $(UTL)makedefs.exe; diff --git a/sys/vms/vmsbuild.com b/sys/vms/vmsbuild.com index 2bc8176db..42fd104f2 100755 --- a/sys/vms/vmsbuild.com +++ b/sys/vms/vmsbuild.com @@ -1,5 +1,5 @@ $ ! vms/vmsbuild.com -- compile and link NetHack 3.6.* [pr] -$ version_number = "3.6.1" +$ version_number = "3.6.2" $ ! $NHDT-Date: 1524689429 2018/04/25 20:50:29 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.17 $ # Copyright (c) 2018 by Robert Patrick Rankin # NetHack may be freely redistributed. See license for details. diff --git a/sys/wince/winhack.rc b/sys/wince/winhack.rc index 79302066a..10a0a03f5 100644 --- a/sys/wince/winhack.rc +++ b/sys/wince/winhack.rc @@ -285,7 +285,7 @@ END VS_VERSION_INFO VERSIONINFO FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -300,17 +300,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "NetHack 3.6.1 for Windows CE\0" + VALUE "Comments", "NetHack 3.6.2 for Windows CE\0" VALUE "CompanyName", " \0" VALUE "FileDescription", "nethackm\0" - VALUE "FileVersion", "3, 6, 1, 0\0" + VALUE "FileVersion", "3, 6, 2, 0\0" VALUE "InternalName", "nethackm\0" VALUE "LegalCopyright", "Copyright © 1985-2018\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nethackm.exe\0" VALUE "PrivateBuild", "090914\0" VALUE "ProductName", "NetHack\0" - VALUE "ProductVersion", "3, 6, 1, 0\0" + VALUE "ProductVersion", "3, 6, 2, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/sys/wince/winhcksp.rc b/sys/wince/winhcksp.rc index 094c4f294..2ac6e1710 100644 --- a/sys/wince/winhcksp.rc +++ b/sys/wince/winhcksp.rc @@ -276,17 +276,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "NetHack 3.6.1 for Smartphone 2002\0" + VALUE "Comments", "NetHack 3.6.2 for Smartphone 2002\0" VALUE "CompanyName", " \0" VALUE "FileDescription", "nethackm\0" - VALUE "FileVersion", "3, 6, 1, 0\0" + VALUE "FileVersion", "3, 6, 2, 0\0" VALUE "InternalName", "nethackm\0" VALUE "LegalCopyright", "Copyright © 1985-2018\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nethackm.exe\0" VALUE "PrivateBuild", "090914\0" VALUE "ProductName", "NetHack For Smartphone\0" - VALUE "ProductVersion", "3, 6, 1, 0\0" + VALUE "ProductVersion", "3, 6, 2, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 3551e4376..dd278e0a4 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -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.1. +of the tty and graphical windows versions of NetHack 3.6.2. You can build a TTY version of NetHack and a Windows Graphical version. You can use one of the following build environments: @@ -106,7 +106,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.1 release have not +NetHack's save files and bones files in the 3.6.2 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/console.rc b/sys/winnt/console.rc index 1c35e16bd..0d9733971 100644 --- a/sys/winnt/console.rc +++ b/sys/winnt/console.rc @@ -12,8 +12,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -29,13 +29,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "NetHack for Windows - TTY Interface\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "NetHack\0" VALUE "LegalCopyright", "Copyright (C) 1985 - 2018. By Stichting Mathematisch Centrum and M. Stephenson. See license for details.\0" VALUE "OriginalFilename", "NetHack.exe\0" VALUE "PrivateBuild", "050102\0" VALUE "ProductName", "NetHack\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/sys/winnt/nethack.def b/sys/winnt/nethack.def index e163eaf5e..9d3a5cceb 100644 --- a/sys/winnt/nethack.def +++ b/sys/winnt/nethack.def @@ -1,5 +1,5 @@ NAME NETHACK -DESCRIPTION 'NetHack 3.6.1 for Windows NT' +DESCRIPTION 'NetHack 3.6.2 for Windows' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/sys/winnt/sysconf b/sys/winnt/sysconf index 407aba29f..283a55df4 100644 --- a/sys/winnt/sysconf +++ b/sys/winnt/sysconf @@ -24,7 +24,7 @@ WIZARDS=* # Only available if NetHack was compiled with DUMPLOG # Allows following placeholders: # %% literal '%' -# %v version (eg. "3.6.1-0") +# %v version (eg. "3.6.2-0") # %u game UID # %t game start time, UNIX timestamp format # %T current time, UNIX timestamp format diff --git a/win/macosx/NetHackGuidebook.applescript b/win/macosx/NetHackGuidebook.applescript index 28879c010..e91d12e03 100644 --- a/win/macosx/NetHackGuidebook.applescript +++ b/win/macosx/NetHackGuidebook.applescript @@ -1,5 +1,5 @@ #!/usr/bin/osascript -# NetHack 3.6.1 NetHackGuidebook.applescript $NHDT-Date: 1524684596 2018/04/25 19:29:56 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ +# NetHack 3.6.2 NetHackGuidebook.applescript $NHDT-Date: 1524684596 2018/04/25 19:29:56 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2011 # NetHack may be freely redistributed. See license for details. diff --git a/win/macosx/NetHackTerm.applescript b/win/macosx/NetHackTerm.applescript index f1d1eb122..a4936d021 100644 --- a/win/macosx/NetHackTerm.applescript +++ b/win/macosx/NetHackTerm.applescript @@ -1,5 +1,5 @@ #!/usr/bin/osascript -# NetHack 3.6.1 NetHackTerm.applescript $NHDT-Date: 1524684597 2018/04/25 19:29:57 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ +# NetHack 3.6.2 NetHackTerm.applescript $NHDT-Date: 1524684597 2018/04/25 19:29:57 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2011 # NetHack may be freely redistributed. See license for details. diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index a1af46ed2..8f3e1ae1f 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -2276,7 +2276,7 @@ logDebug(const char *fmt, ...) /* Reading and writing settings from the registry. */ #define CATEGORYKEY "Software" #define COMPANYKEY "NetHack" -#define PRODUCTKEY "NetHack 3.6.1" +#define PRODUCTKEY "NetHack 3.6.2" #define SETTINGSKEY "Settings" #define MAINSHOWSTATEKEY "MainShowState" #define MAINMINXKEY "MainMinX" diff --git a/win/win32/nethack.rc b/win/win32/nethack.rc index 04ff88d55..4330f14f1 100644 --- a/win/win32/nethack.rc +++ b/win/win32/nethack.rc @@ -60,8 +60,8 @@ IDI_ICON1 ICON "nethack.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -77,12 +77,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "NetHack for Windows - TTY Interface" - VALUE "FileVersion", "3.6.1" + VALUE "FileVersion", "3.6.2" VALUE "InternalName", "NetHack" VALUE "LegalCopyright", "Copyright (C) 1985 - 2018. By Stichting Mathematisch Centrum and M. Stephenson. See license for details." VALUE "OriginalFilename", "NetHack.exe" VALUE "ProductName", "NetHack" - VALUE "ProductVersion", "3.6.1" + VALUE "ProductVersion", "3.6.2" END END BLOCK "VarFileInfo" -- 2.40.0