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 15:15:37 -05:00
parent a11a6b3204 41299d44ae
commit d132093595
4 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/files.c
View File

@@ -4360,6 +4360,14 @@ reveal_paths(VOID_ARGS)
#ifdef DLB
raw_printf("Basic data files%s are collected inside:", buf);
filep = DLBFILE;
#ifdef VERSION_IN_DLB_FILENAME
Strcpy(buf, build_dlb_filename((const char *) 0));
#ifdef PREFIXES_IN_USE
fqn = fqname(buf, DATAPREFIX, 1);
if (fqn)
filep = fqn;
#endif /* PREFIXES_IN_USE */
#endif
raw_printf(" \"%s\"", filep);
#ifdef DLBFILE2
filep = DLBFILE2;
@@ -4369,6 +4377,27 @@ reveal_paths(VOID_ARGS)
raw_printf("Basic data files%s are in many separate files.", buf);
#endif /* ?DLB */
/* dumplog */
#ifdef DUMPLOG
#ifdef SYSCF
fqn = sysopt.dumplogfile;
#else /* !SYSCF */
#ifdef DUMPLOG_FILE
fqn = DUMPLOG_FILE;
#else
fqn = (char *) 0;
#endif
#endif /* ?SYSCF */
if (fqn) {
raw_print("Your end-of-game dump 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.");
/* personal configuration file */
buf[0] = '\0';
@@ -4421,25 +4450,6 @@ reveal_paths(VOID_ARGS)
raw_printf(" \"%s\"", fqn ? fqn : default_configfile);
#endif /* ?UNIX */
#ifdef DUMPLOG
#ifdef SYSCF
fqn = sysopt.dumplogfile;
#else /* !SYSCF */
#ifdef DUMPLOG_FILE
fqn = DUMPLOG_FILE;
#else
fqn = (char *) 0;
#endif
#endif /* ?SYSCF */
if (fqn) {
raw_print("Your end-of-game dump 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.");
raw_print("");
}

7
src/objnam.c
View File

@@ -2445,8 +2445,11 @@ const char *oldstr;
if (index("zxs", lo_c)
|| (len >= 2 && lo_c == 'h' && index("cs", lowc(*(spot - 1)))
/* 21st century k-sound */
&& !(len >= 4 && !strcmpi(spot - 2, "ech")
&& index("tm", lowc(*(spot - 4)))))
&& !(len >= 4 &&
((lowc(*(spot - 2)) == 'e'
&& index("mt", lowc(*(spot - 3)))) ||
(lowc(*(spot - 2)) == 'o'
&& index("lp", lowc(*(spot - 3)))))))
/* Kludge to get "tomatoes" and "potatoes" right */
|| (len >= 4 && !strcmpi(spot - 2, "ato"))
|| (len >= 5 && !strcmpi(spot - 4, "dingo"))) {