Merge branch 'NetHack-3.6'

diff --cc doc/Guidebook.mn
index cd96e04aa412ca6659dfce48acce0a2674ce8daa,c039e3bba027e72ac9d30f80d1621da9446a39ee..02f561fe1702bafea5b5c631544803c27b23f3d9
--- 1/doc/Guidebook.mn
--- 2/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@@ -21,10 -21,10 +21,10 @@@
  .ds h0 "NetHack Guidebook
  .ds h1
  .ds h2 %
 -.ds vr "NetHack 3.6
 +.ds vr "NetHack 3.7
  .ds f0 "\*(vr
  .ds f1
- .ds f2 "November 7, 2019
+ .ds f2 "November 17, 2019
  .
  .\" A note on some special characters:
  .\" \(lq = left double quote

diff --cc doc/Guidebook.tex
Simple merge

diff --cc include/dungeon.h
Simple merge

diff --cc include/global.h
Simple merge

diff --cc src/files.c
index e1bcf88aa42989a62f3c7a65ea241e2830885d62,a9bee528a705e119b81d701323fc95df43c9606a..f84e7d7b46df2e5c96f530d2aee9a1796f08f7c8
--- 1/src/files.c
--- 2/src/files.c
+++ b/src/files.c
@@@ -2833,8 -2598,8 +2833,8 @@@ char *origbuf
  #endif /* SYSCF */
  
      } else if (match_varname(buf, "BOULDER", 3)) {
-         (void) get_uchars(bufp, &g.ov_primary_syms[SYM_BOULDER + SYM_OFF_X], TRUE, 1,
-                           "BOULDER");
 -        (void) get_uchars(bufp, &ov_primary_syms[SYM_BOULDER + SYM_OFF_X],
++        (void) get_uchars(bufp, &g.ov_primary_syms[SYM_BOULDER + SYM_OFF_X],
+                           TRUE, 1, "BOULDER");
      } else if (match_varname(buf, "MENUCOLOR", 9)) {
          if (!add_menu_coloring(bufp))
              retval = FALSE;
@@@ -4317,15 -4054,15 +4317,15 @@@ reveal_paths(VOID_ARGS
  #ifndef UNIX
  #ifdef PREFIXES_IN_USE
  #ifdef WIN32
 -    strp = fqn_prefix_names[SYSCONFPREFIX];
 +    cstrp = fqn_prefix_names[SYSCONFPREFIX];
  #else
 -    strp = fqn_prefix_names[HACKPREFIX];
 +    cstrp = fqn_prefix_names[HACKPREFIX];
  #endif /* WIN32 */
      maxlen = BUFSZ - sizeof " (in )";
 -    if (strp && (int) strlen(strp) < maxlen)
 -        Sprintf(buf, " (in %s)", strp);
 +    if (cstrp && (int) strlen(cstrp) < maxlen)
 +        Sprintf(buf, " (in %s)", cstrp);
  #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 */
  
  #ifdef UNIX
@@@ -4348,6 -4085,27 +4348,27 @@@
      raw_printf("    \"%s\"", filep);
  #endif /* UNIX */
  
 -    strp = fqn_prefix_names[DATAPREFIX];
+     /* dlb vs non-dlb */
+ 
+     buf[0] = '\0';
+ #ifdef PREFIXES_IN_USE
 -    if (strp && (int) strlen(strp) < maxlen)
 -        Sprintf(buf, " (in %s)", strp);
++    cstrp = fqn_prefix_names[DATAPREFIX];
+     maxlen = BUFSZ - sizeof " (in )";
++    if (cstrp && (int) strlen(cstrp) < maxlen)
++        Sprintf(buf, " (in %s)", cstrp);
+ #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 */
  
      buf[0] = '\0';

diff --cc src/options.c
Simple merge