From 9eefeef5d252c95e1a4df7b439b2667cbddd4046 Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 9 Jul 2019 17:42:32 -0700 Subject: [PATCH] fix github issue #200 - docs for 'strange object' Fixes #200 The Guidebook claims that there's no symbol for 'S_strange_object' which is literally true, but there is one for S_strange_obj. It has been in place longer than the paragraph claiming that there's no way to customize that symbol. I'm not sure why variant spelling was used. Also, files.c doesn't use loadsyms[], it calls a routine which returns a pointer to a specific element in that array. --- doc/Guidebook.mn | 12 ++---------- doc/Guidebook.tex | 13 +------------ src/files.c | 5 ++--- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 7a4ffd8d6..9b215d2fb 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.310 $ $NHDT-Date: 1562114349 2019/07/03 00:39:09 $ +.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.311 $ $NHDT-Date: 1562719337 2019/07/10 00:42:17 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. @@ -24,7 +24,7 @@ .ds vr "NetHack 3.6 .ds f0 "\*(vr .ds f1 -.ds f2 "May 7, 2019 +.ds f2 "July 9, 2019 . .\" A note on some special characters: .\" \(lq = left double quote @@ -4555,14 +4555,6 @@ z S_zruty (zruty) .\"TABLE_END Do not delete this line. .TE .pg -There is one additional class of object, described as \(lqstrange object\(rq, -which will occasionally be the shape taken on by mimics and shown -as \(oq]\(cq for maps displayed as text characters. -Although the displayed character is the same as the default value for -\(lqS_mimic_def\(rq, it is a different symbol and there is no corresponding -\(lqS_strange_object\(rq symbol nor any way to assign an alternate value -for it. -.pg .hn 2 Configuring NetHack for Play by the Blind .pg diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index bc9b5e00f..d642cfed5 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -45,7 +45,7 @@ %.au \author{Original version - Eric S. Raymond\\ (Edited and expanded for 3.6 by Mike Stephenson and others)} -\date{May 7, 2019} +\date{July 9, 2019} \maketitle @@ -5048,17 +5048,6 @@ Default & Symbol Name & Description\\ \end{longtable}% } -%.pg -There is one additional class of object, described as ``strange object'', -which will occasionally be the shape taken on by mimics and shown as -`{\tt \verb+]+}' -for maps displayed as text characters. -Although the displayed character is the same as the default value for -`S\verb+_+mimic\verb+_+def', it is a different symbol and there is no -corresponding -`S\verb+_+strange\verb+_+object' symbol nor any way to assign an -alternate value for it. - %.pg %.hn 2 \subsection*{Configuring {\it NetHack\/} for Play by the Blind} diff --git a/src/files.c b/src/files.c index 29ad2f1a8..930d36ea2 100644 --- a/src/files.c +++ b/src/files.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 files.c $NHDT-Date: 1559670605 2019/06/04 17:50:05 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.250 $ */ +/* NetHack 3.6 files.c $NHDT-Date: 1562719337 2019/07/10 00:42:17 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.252 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -3140,7 +3140,6 @@ boolean FDECL((*proc), (char *)); } extern struct symsetentry *symset_list; /* options.c */ -extern struct symparse loadsyms[]; /* drawing.c */ extern const char *known_handling[]; /* drawing.c */ extern const char *known_restrictions[]; /* drawing.c */ static int symset_count = 0; /* for pick-list building only */ @@ -3213,7 +3212,7 @@ char *buf; int which_set; { int val, i; - struct symparse *symp = (struct symparse *) 0; + struct symparse *symp; char *bufp, *commentp, *altp; /* convert each instance of whitespace (tabs, consecutive spaces)