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

Merge branch 'NetHack-3.6'

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

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)