From 60e2598d81e53b1cdaa187f61d92e455d1a145cb Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sun, 5 Oct 2025 22:10:34 -0400
Subject: [PATCH] SYMBOLS=S_ghost:

Resolves #1448
---
 doc/Guidebook.mn    | 5 +++--
 doc/Guidebook.tex   | 5 +++--
 src/glyphs.c        | 4 ++--
 win/share/tilemap.c | 8 ++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index dae3b6713..1139806e5 100644
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -3664,7 +3664,7 @@ See the \(lqModifying NetHack Symbols\(rq section.
 Example:
 .sd
 \f(CR# replace small punctuation (tick marks) with digits\fP
-\f(CRSYMBOLS=S_boulder:0,S_golem:7\fP
+\f(CRSYMBOLS=S_golem:7\fP
 .ed
 .lp WIZKIT
 Debug mode only:  extra items to add to initial inventory.
@@ -3699,7 +3699,8 @@ OPTIONS=color           # Display things in color if possible
 OPTIONS=lit_corridor    # Show lit corridors differently
 OPTIONS=hilite_pet,hilite_pile
 # Replace small punctuation (tick marks) with digits
-SYMBOLS=S_boulder:0,S_golem:7
+OPTIONS=boulder:0
+SYMBOLS=S_golem:7
 #
 # No startup splash screen. Windows GUI only.
 OPTIONS=!splash_screen
diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index a54d02b68..f3d3cfc38 100644
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -4015,7 +4015,7 @@ Example:
 %.sd
 \begin{verbatim}
    # replace small punctuation (tick marks) with digits
-   SYMBOLS=S_boulder:0,S_golem:7
+   SYMBOLS=S_golem:7
 \end{verbatim}
 %.ed
 
@@ -4051,7 +4051,8 @@ Here is an example of configuration file contents:
     OPTIONS=lit_corridor    # Show lit corridors differently
     OPTIONS=hilite_pet,hilite_pile
     # Replace small punctuation (tick marks) with digits
-    SYMBOLS=S_boulder:0,S_golem:7
+    OPTIONS=boulder:0
+    SYMBOLS=S_golem:7
 
     # No startup splash screen. Windows GUI only.
     OPTIONS=!splash_screen
diff --git a/src/glyphs.c b/src/glyphs.c
index 8b6a77854..c584e212f 100644
--- a/src/glyphs.c
+++ b/src/glyphs.c
@@ -251,7 +251,7 @@ glyph_find_core(
                     break;
                 case find_pm:
                     if (glyph_is_monster(glyph)
-                        && monsym(&mons[glyph_to_mon(glyph)])
+                        && mons[glyph_to_mon(glyph)].mlet
                            == findwhat->val)
                         do_callback = TRUE;
                     break;
@@ -819,7 +819,7 @@ parse_id(
     int i = 0, j, mnum, glyph,
         pm_offset = 0, oc_offset = 0, cmap_offset = 0,
         pm_count = 0, oc_count = 0, cmap_count = 0;
-    boolean skip_base = FALSE, skip_this_one, dump_ids = FALSE,
+    boolean skip_base = FALSE, skip_this_one = FALSE, dump_ids = FALSE,
             filling_cache = FALSE, is_S = FALSE, is_G = FALSE;
     char buf[4][QBUFSZ];
 
diff --git a/win/share/tilemap.c b/win/share/tilemap.c
index 832bae769..41583dfa0 100644
--- a/win/share/tilemap.c
+++ b/win/share/tilemap.c
@@ -1235,11 +1235,11 @@ init_tilemap(void)
         Snprintf(tilemap[GLYPH_STATUE_MALE_OFF + i].name,
                 sizeof tilemap[0].name,
                 "statue of male %s (mnum=%d)",
-                tilename(MON_GLYPH, file_entry, 0), file_entry);
+                tilename(MON_GLYPH, file_entry, 0), i);
         Snprintf(tilemap[GLYPH_STATUE_MALE_PILETOP_OFF + i].name,
                 sizeof tilemap[0].name,
                 "piletop statue of male %s (mnum=%d)",
-                tilename(MON_GLYPH, file_entry, 0), file_entry);
+                tilename(MON_GLYPH, file_entry, 0), i);
         add_tileref(tilenum, GLYPH_STATUE_MALE_OFF + i, generated, file_entry,
                     tilemap[GLYPH_STATUE_MALE_OFF + i].name,
                     "");
@@ -1258,10 +1258,10 @@ init_tilemap(void)
         Snprintf(tilemap[GLYPH_STATUE_FEM_OFF + i].name,
                 sizeof tilemap[0].name,
                 "statue of female %s (mnum=%d)",
-                tilename(MON_GLYPH, file_entry, 0), file_entry);
+                tilename(MON_GLYPH, file_entry, 0), i);
         Sprintf(tilemap[GLYPH_STATUE_FEM_PILETOP_OFF + i].name,
                 "piletop statue of female %s (mnum=%d)",
-                tilename(MON_GLYPH, file_entry, 0), file_entry);
+                tilename(MON_GLYPH, file_entry, 0), i);
         add_tileref(tilenum, GLYPH_STATUE_FEM_OFF + i, generated, file_entry,
                     tilemap[GLYPH_STATUE_FEM_OFF + i].name, "");
         add_tileref(tilenum, GLYPH_STATUE_FEM_PILETOP_OFF + i, generated,