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

Merge branch 'NetHack-3.6' into bart-test

Browse Source
This commit is contained in:
nhmall
2019-11-11 11:27:50 -05:00
parent d4ff00cd40 c2bbbebd8e
commit bc69fc65d2
45 changed files with 2062 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/decl.h
View File

@@ -448,7 +448,7 @@ struct breadcrumbs {
E const char *ARGV0;
#endif
enum earlyarg {ARG_DEBUG, ARG_VERSION
enum earlyarg {ARG_DEBUG, ARG_VERSION, ARG_SHOWPATHS
#ifdef WIN32
,ARG_WINDOWS
#endif

6
include/extern.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 extern.h $NHDT-Date: 1571436000 2019/10/18 22:00:00 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.730 $ */
/* NetHack 3.6 extern.h $NHDT-Date: 1573346164 2019/11/10 00:36:04 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.738 $ */
/* Copyright (c) Steve Creps, 1988. */
/* NetHack may be freely redistributed. See license for details. */
@@ -474,6 +474,7 @@ E int NDECL(Helmet_on);
E int FDECL(select_off, (struct obj *));
E int NDECL(take_off);
#endif
E const char *FDECL(fingers_or_gloves, (BOOLEAN_P));
E void FDECL(off_msg, (struct obj *));
E void FDECL(set_wear, (struct obj *));
E boolean FDECL(donning, (struct obj *));
@@ -846,6 +847,7 @@ E void NDECL(really_close);
#ifdef DEBUG
E boolean FDECL(debugcore, (const char *, BOOLEAN_P));
#endif
E void NDECL(reveal_paths);
E boolean FDECL(read_tribute, (const char *, const char *, int,
char *, int, unsigned));
E boolean FDECL(Death_quote, (char *, int));
@@ -1750,6 +1752,7 @@ E int FDECL(rnd_class, (int, int));
E const char *FDECL(suit_simple_name, (struct obj *));
E const char *FDECL(cloak_simple_name, (struct obj *));
E const char *FDECL(helm_simple_name, (struct obj *));
E const char *FDECL(gloves_simple_name, (struct obj *));
E const char *FDECL(mimic_obj_name, (struct monst *));
E char *FDECL(safe_qbuf, (char *, const char *, const char *, struct obj *,
char *(*)(OBJ_P), char *(*)(OBJ_P), const char *));
@@ -1967,6 +1970,7 @@ E void FDECL(make_blinded, (long, BOOLEAN_P));
E void NDECL(toggle_blindness);
E boolean FDECL(make_hallucinated, (long, BOOLEAN_P, long));
E void FDECL(make_deaf, (long, BOOLEAN_P));
E void FDECL(make_glib, (int));
E void NDECL(self_invis_message);
E int NDECL(dodrink);
E int FDECL(dopotion, (struct obj *));

39
include/patchlevel.h
View File

@@ -37,12 +37,41 @@
/* Version 3.6.x */
/* Patch 3, <insert date here>
*
*
* Fixed stale 'thrownobj' pointer for returning thrown aklys while engulfed
* Fixed uarmh null pointer dereference if a helm of opposite alignment came
* off due to being polymorphed
* Fixed 'object lost' panic when attempting to crawl of of the water during
* emergency disrobing/dropping
* Running now stops when moving over engravings so you can tell where they are
* Fixed detection of unseen/secret doors which failed to find monsters hiding
* under objects and failed to find monsters hiding at trap locations
* Ensured fatal status conditions made it to disclosure and/or dumplog
* Fixed "Bad fruit #N" warnings when saving bones with 'perm_invent' On
* Fixed it so yellow dragons don't have green breath
* Added several grammar corrections
* Improved recognition of deafness for several situations including the
* playing of musical instruments and bribing negotiations with demon lords
* Fixed ignoring of god's wrath when hero injured himself during altar kick
* Fixed several cases where persistent inventory window was not updated
* Fixed temple priests or shopkeepers moving over other monsters
* Ensured that thrown or kicked objects will end up in bones
* Made water go all the way to the edges of level on the Plane of Water
* Made clouds disrupt line of sight along the edges of the Plane of Air
* Improved and expanded usage of status highlighting percentage rules
* Added more than 15 improvements and fixes to the curses window port
* Added and documented significant changes to default directory choices for
* the Windows platform
* Improved the layout and display of the player selection dialog used on the
* Windows graphical implementation
* Allowed the msdos implementation to build with curses and PDCurses
* Included over 100 other fixes and improvements as outlined in doc/fixes36.3
*/
/* Patch 2, May 7, 2019
*
* Over 320 bug fixes including a couple of crash bug fixes
* Over 320 bug fixes including a couple of crash bug fixes as outlined in
* doc/fixes36.2
* More than 15 enhancements or improvements
* Ensuring that unix Makefiles do not rely on features unique to gnu make
* Improvements to hilite_status parsing in an effort to ensure that expected
@@ -54,13 +83,15 @@
*/
/* Patch 1, April 27, 2018
* Over four hundred and seventy bug fixes and improvements.
*
* Over four hundred and seventy bug fixes and improvements as outlined in
* doc/fixes36.1
*/
/*
* NetHack 3.6.0, December 7, 2015
*
* Hundreds of bug fixes.
* Hundreds of bug fixes as outlined in doc/fixes36.0.
* Some code reorganization.
* Some new features.
* Variations of some community patches rolled in.