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-11-18 19:19:12 -05:00
parent ea17a00310 fc2886efb4
commit f7cb969e2d
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/fixes36.3
View File

@@ -286,6 +286,16 @@ tty: revert the attempt to fix "message line anomaly: if autodecribe feedback
prompts that spanned more than one line, a more significant issue
Fixes post-beta1
------------------------------------------------------------------
fix several tribute typos
pluralization correction for unlikely epoch and loch
ensure that --showpaths displays the personal configuration file last
unix: Fix double DLB definition in linux hints file
windows: fix --showpaths output for the data file which relies on being
constructed programmatically to incorporate the version suffix
Platform- and/or Interface-Specific Fixes or Features
-----------------------------------------------------
EDIT_GETLIN: wizard mode 'monpolycontrol' was using the getlin() answer buffer

22
src/files.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 files.c $NHDT-Date: 1574037901 2019/11/18 00:45:01 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.270 $ */
/* NetHack 3.6 files.c $NHDT-Date: 1574116097 2019/11/18 22:28:17 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.272 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4264,10 +4264,13 @@ boolean wildcards;
void
reveal_paths(VOID_ARGS)
{
const char *fqn, *gamename = (g.hname && *g.hname) ? g.hname : "NetHack";
const char *fqn, *nodumpreason;
char buf[BUFSZ];
#if defined(SYSCF) || !defined(UNIX)
#if defined(SYSCF) || !defined(UNIX) || defined(DLB)
const char *filep;
#ifdef SYSCF
const char *gamename = (g.hname && *g.hname) ? g.hname : "NetHack";
#endif
#endif
#if defined(PREFIXES_IN_USE)
const char *cstrp;
@@ -4379,7 +4382,10 @@ reveal_paths(VOID_ARGS)
/* dumplog */
#ifdef DUMPLOG
#ifndef DUMPLOG
nodumpreason = "not supported";
#else
nodumpreason = "disabled";
#ifdef SYSCF
fqn = sysopt.dumplogfile;
#else /* !SYSCF */
@@ -4389,14 +4395,14 @@ reveal_paths(VOID_ARGS)
fqn = (char *) 0;
#endif
#endif /* ?SYSCF */
if (fqn) {
raw_print("Your end-of-game dump file:");
if (fqn && *fqn) {
raw_print("Your end-of-game disclosure file:");
(void) dump_fmtstr(fqn, buf, FALSE);
buf[sizeof buf - sizeof " \"\""] = '\0';
raw_printf(" \"%s\"", buf);
} else
#endif /* DUMPLOG */
raw_print("No end-of-game dump file.");
#endif /* ?DUMPLOG */
raw_printf("No end-of-game disclosure file (%s).", nodumpreason);
/* personal configuration file */