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

Merge branch 'master' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2019-12-06 16:55:20 -05:00
parent 7de0b39b53 a512567103
commit 31429f10cc
4 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
doc/fixes36.4 Normal file
View File

@@ -0,0 +1,33 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1575665952 2019/12/06 20:59:12 $
This fixes36.4 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.3 in December 2019. Hypothetical version
3.6.4 may not be released, in which case these fixes will appear in 3.7.0.
General Fixes and Modified Features
-----------------------------------
GDBPATH and GREPPATH from sysconf or -D... on compilation command line were
being processed even if PANICTRACE was disabled but only being freed
at end of game when that was enabled
Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository
------------------------------------------------------------------
Platform- and/or Interface-Specific Fixes or Features
-----------------------------------------------------
General New Features
--------------------
NetHack Community Patches (or Variation) Included
-------------------------------------------------
Code Cleanup and Reorganization
-------------------------------

7
include/global.h
View File

@@ -11,9 +11,10 @@
/*
* Development status possibilities.
*/
#define NH_STATUS_RELEASED 0 /* Released */
#define NH_STATUS_WIP 1 /* Work in progress */
#define NH_STATUS_BETA 2 /* BETA testing */
#define NH_STATUS_RELEASED 0 /* Released */
#define NH_STATUS_WIP 1 /* Work in progress */
#define NH_STATUS_BETA 2 /* BETA testing */
#define NH_STATUS_POSTRELEASE 3 /* patch commit point only */
/*
* Development status of this NetHack version.

14
src/mdlib.c
View File

@@ -243,16 +243,20 @@ char *outbuf;
const char *build_date;
{
char subbuf[64], versbuf[64];
char betabuf[64];
char statusbuf[64];
#if (NH_DEVEL_STATUS != NH_STATUS_RELEASED)
#if (NH_DEVEL_STATUS == NH_STATUS_BETA)
Strcpy(betabuf, " Beta");
Strcpy(statusbuf, " Beta");
#else
Strcpy(betabuf, " Work-in-progress");
#if (NH_DEVEL_STATUS == NH_STATUS_WIP)
Strcpy(statusbuf, " Work-in-progress");
#else
Strcpy(statusbuf, " post-release");
#endif
#endif
#else
betabuf[0] = '\0';
statusbuf[0] = '\0';
#endif
subbuf[0] = '\0';
#ifdef PORT_SUB_ID
@@ -261,7 +265,7 @@ const char *build_date;
#endif
Sprintf(outbuf, "%s NetHack%s Version %s%s - last %s %s.", PORT_ID,
subbuf, version_string(versbuf, "."), betabuf,
subbuf, version_string(versbuf, "."), statusbuf,
date_via_env ? "revision" : "build", build_date);
return outbuf;
}

5
src/sys.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 sys.c $NHDT-Date: 1547118632 2019/01/10 11:10:32 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.43 $ */
/* NetHack 3.6 sys.c $NHDT-Date: 1575665952 2019/12/06 20:59:12 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.46 $ */
/* Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -109,12 +109,11 @@ sysopt_release()
if (sysopt.genericusers)
free((genericptr_t) sysopt.genericusers),
sysopt.genericusers = (char *) 0;
#ifdef PANICTRACE
if (sysopt.gdbpath)
free((genericptr_t) sysopt.gdbpath), sysopt.gdbpath = (char *) 0;
if (sysopt.greppath)
free((genericptr_t) sysopt.greppath), sysopt.greppath = (char *) 0;
#endif
/* this one's last because it might be used in panic feedback, although
none of the preceding ones are likely to trigger a controlled panic */
if (sysopt.fmtd_wizard_list)