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

Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

Browse Source
This commit is contained in:
nhmall
2019-11-17 19:57:18 -05:00
parent f75939e27e 1301e3bd76
commit f4cbd4e538
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/files.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 files.c $NHDT-Date: 1573869063 2019/11/16 01:51:03 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.269 $ */ /* NetHack 3.6 files.c $NHDT-Date: 1574037901 2019/11/18 00:45:01 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.270 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2598,8 +2598,8 @@ char *origbuf;
#endif /* SYSCF */ #endif /* SYSCF */
} else if (match_varname(buf, "BOULDER", 3)) { } else if (match_varname(buf, "BOULDER", 3)) {
(void) get_uchars(bufp, &ov_primary_syms[SYM_BOULDER + SYM_OFF_X], TRUE, 1, (void) get_uchars(bufp, &ov_primary_syms[SYM_BOULDER + SYM_OFF_X],
"BOULDER"); TRUE, 1, "BOULDER");
} else if (match_varname(buf, "MENUCOLOR", 9)) { } else if (match_varname(buf, "MENUCOLOR", 9)) {
if (!add_menu_coloring(bufp)) if (!add_menu_coloring(bufp))
retval = FALSE; retval = FALSE;
@@ -4062,13 +4062,13 @@ reveal_paths(VOID_ARGS)
if (strp && (int) strlen(strp) < maxlen) if (strp && (int) strlen(strp) < maxlen)
Sprintf(buf, " (in %s)", strp); Sprintf(buf, " (in %s)", strp);
#endif /* PREFIXES_IN_USE */ #endif /* PREFIXES_IN_USE */
raw_printf("%s loadable symbols file%s:", s_suffix(gamename), buf); raw_printf("The loadable symbols file%s:", buf);
#endif /* UNIX */ #endif /* UNIX */
#ifdef UNIX #ifdef UNIX
envp = getcwd(cwdbuf, PATH_MAX); envp = getcwd(cwdbuf, PATH_MAX);
if (envp) { if (envp) {
raw_printf("%s loadable symbols file:", s_suffix(gamename)); raw_print("The loadable symbols file:");
raw_printf(" \"%s/%s\"", envp, SYMBOLS); raw_printf(" \"%s/%s\"", envp, SYMBOLS);
} }
#else /* UNIX */ #else /* UNIX */
@@ -4085,6 +4085,27 @@ reveal_paths(VOID_ARGS)
raw_printf(" \"%s\"", filep); raw_printf(" \"%s\"", filep);
#endif /* UNIX */ #endif /* UNIX */
/* dlb vs non-dlb */
buf[0] = '\0';
#ifdef PREFIXES_IN_USE
strp = fqn_prefix_names[DATAPREFIX];
maxlen = BUFSZ - sizeof " (in )";
if (strp && (int) strlen(strp) < maxlen)
Sprintf(buf, " (in %s)", strp);
#endif
#ifdef DLB
raw_printf("Basic data files%s are collected inside:", buf);
filep = DLBFILE;
raw_printf(" \"%s\"", filep);
#ifdef DLBFILE2
filep = DLBFILE2;
raw_printf(" \"%s\"", filep);
#endif
#else /* !DLB */
raw_printf("Basic data files%s are in many separate files.", buf);
#endif /* ?DLB */
/* personal configuration file */ /* personal configuration file */
buf[0] = '\0'; buf[0] = '\0';