nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge 'NetHack-3.6' changes into NetHack-3.7-Jan2020

Browse Source
This commit is contained in:
nhmall
2020-01-18 11:35:26 -05:00
parent d5174323eb a8208b44c8
commit 585511e89e
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Files
View File

@@ -132,7 +132,7 @@ version.c vision.c weapon.c were.c wield.c windows.c
wizard.c worm.c worn.c write.c zap.c
sys/amiga:
(files for Amiga versions - untested for 3.6.4)
(files for Amiga versions - untested for 3.6.5)
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 amistack.c amitty.c
@@ -142,12 +142,12 @@ winchar.c windefs.h winext.h winfuncs.c winkey.c
winmenu.c winproto.h winreq.c winstr.c xpm2iff.c
sys/atari:
(files for Atari version - untested for 3.6.4)
(files for Atari version - untested for 3.6.5)
Install.tos atarifnt.uue nethack.mnu setup.g tos.c
unx2atar.sed
sys/be:
(files for BeOS version - untested for 3.6.4)
(files for BeOS version - untested for 3.6.5)
README bemain.c
sys/mac:
@@ -159,7 +159,7 @@ macmenu.c mactopl.c mactty.c macunix.c macwin.c
mgetline.c mmodal.c mrecover.c mrecover.hqx mttymain.c
sys/msdos:
(files for MSDOS version - tested for 3.6.4 via partial cross-compile only)
(files for MSDOS version)
Install.dos Makefile.BC Makefile.GCC
Makefile.MSC Makefile1.cross Makefile2.cross
SCHEMA35.MSC moveinit.pat msdos-cross-compile.sh
@@ -175,7 +175,7 @@ vidvesa.c vidvga.c
nhico.uu nhpif.uu
sys/os2:
(files for OS/2 version - untested for 3.6.4)
(files for OS/2 version - untested for 3.6.5)
Install.os2 Makefile.os2 nhpmico.uu os2.c
sys/share:
@@ -185,10 +185,10 @@ random.c
(Berkeley uudecode file, which may be used in build process of any version)
uudecode.c
(file for MSDOS, OS/2, Amiga, and Atari versions - untested for 3.6.4)
(file for MSDOS, OS/2, Amiga, and Atari versions - untested for 3.6.5)
pcmain.c
(file for MSDOS, OS/2, and Atari versions - untested for 3.6.4)
(file for MSDOS, OS/2, and Atari versions - untested for 3.6.5)
NetHack.cnf pctty.c
(file for MSDOS, OS/2, and VMS versions)
@@ -200,10 +200,10 @@ nhlan.c
(file for VMS version)
tclib.c
(files for MSDOS and OS/2 versions - untested for 3.6.4)
(files for MSDOS and OS/2 versions - untested for 3.6.5)
Makefile.lib termcap.uu
(files for MSDOS, OS/2 and Atari versions - tested on MSDOS for 3.6.4 via partial cross-compile only)
(files for MSDOS, OS/2 and Atari versions - tested on MSDOS for 3.6.5 via partial cross-compile only)
pcsys.c pcunix.c
(files for UNIX and Be versions)
@@ -262,7 +262,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.4)
(files for Windows CE and PocketPC - untested for 3.6.5)
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
@@ -275,7 +275,7 @@ 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.4)
(header files for Windows CE and PocketPC - untested for 3.6.5)
assert.h errno.h fcntl.h
sys/wince/ceinc/sys:
@@ -343,12 +343,12 @@ cursinit.h cursinvt.c cursinvt.h cursmain.c cursmesg.c cursmesg.h
cursmisc.c cursmisc.h cursstat.c cursstat.h curswins.c curswins.h
win/gem:
(files for GEM versions - untested for 3.6.4)
(files for GEM versions - untested for 3.6.5)
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.4)
(files for GNOME versions - untested for 3.6.5)
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 gnmesg.h gnomeprv.h gnopts.c

24
doc/Guidebook.txt
View File

@@ -15,7 +15,7 @@
Original version - Eric S. Raymond
(Edited and expanded for 3.6 by Mike Stephenson and others)
January 7, 2020
January 14, 2020
@@ -6123,13 +6123,16 @@
NetHack 3.6.4 was released on December 18, 2019 containing a
security fix and a few bug fixes.
NetHack 3.6.5 was released in January, 2020 containing some
security fixes and a small number of bug fixes.
The official NetHack web site is maintained by Ken Lorber at
https://www.nethack.org/.
12.1. SPECIAL THANKS
On behalf of the NetHack community, thank you very much once
again to M. Drew Streib and Pasi Kallinen for providing a public
again to M. Drew Streib and Pasi Kallinen for providing a public
NetHack 3.7 January 7, 2020
@@ -6142,18 +6145,18 @@
NetHack server at nethack.alt.org. Thanks to Keith Simpson and
NetHack server at nethack.alt.org. Thanks to Keith Simpson and
Andy Thomson for hardfought.org. Thanks to all those unnamed dun-
geoneers who invest their time and effort into annual NetHack
tournaments such as Junethack, The November NetHack Tournament
geoneers who invest their time and effort into annual NetHack
tournaments such as Junethack, The November NetHack Tournament
and in days past, devnull.net (gone for now, but not forgotten).
- - - - - - - - - -
From time to time, some depraved individual out there in
netland sends a particularly intriguing modification to help out
From time to time, some depraved individual out there in
netland sends a particularly intriguing modification to help out
with the game. The NetHack Development Team sometimes makes note
of the names of the worst of these miscreants in this, the list
of the names of the worst of these miscreants in this, the list
of Dungeoneers:
Adam Aronow J. Ali Harlow Mikko Juola
Alex Kompel Janet Walz Nathan Eady
@@ -6211,7 +6214,7 @@
Irina Rempt-Drijfhout Mike Passaretti
Izchak Miller Mike Stephenson
Brand and product names are trademarks or registered trade-
Brand and product names are trademarks or registered trade-
marks of their respective holders.
@@ -6224,7 +6227,7 @@
NetHack 3.6 January 14, 2020
@@ -6267,4 +6270,3 @@
NetHack 3.7 January 7, 2020

2
doc/fixes36.5
View File

@@ -6,6 +6,8 @@ produce 3.6.5 as well as any post-release fixes in binaries.
General Fixes and Modified Features
-----------------------------------
fix accessing mons[-1] when trying to gate in a non-valid demon
fix accessing mons[-1] when monster figures out if a tin cures stoning
have string_for_opt() return empty_optstr on failure
ensure existing callers of string_for_opt() check return value before using it
fix potential buffer overflow in add_menu_coloring()