runtime toggle of ENHANCED_SYMBOLS customsymbols

include/decl.h

@@ -752,7 +752,8 @@ struct instance_globals_o {
     boolean opt_need_redraw; /* for doset() */
     boolean opt_need_glyph_reset;
     boolean opt_need_promptstyle;
-    boolean opt_reset_customizations;
+    boolean opt_reset_customcolors;
+    boolean opt_reset_customsymbols;
 
     /* pickup.c */
     int oldcap; /* last encumbrance */

include/extern.h

@@ -1106,12 +1106,13 @@ extern void dump_all_glyphids(FILE *fp) NONNULLARG1;
 extern void fill_glyphid_cache(void);
 extern void free_glyphid_cache(void);
 extern boolean glyphid_cache_status(void);
-extern void apply_customizations(enum graphics_sets which_set);
+extern void apply_customizations(enum graphics_sets which_set,
+                                 enum do_customizations docustomize);
 extern void purge_custom_entries(enum graphics_sets which_set);
 extern void purge_all_custom_entries(void);
 extern void dump_glyphids(void);
 extern void clear_all_glyphmap_colors(void);
-extern void reset_customizations(void);
+extern void reset_customcolors(void);
 
 /* ### hack.c ### */
 
@@ -3383,6 +3384,7 @@ extern char *mixed_to_utf8(char *buf, size_t bufsz, const char *str,
 void free_all_glyphmap_u(void);
 int set_map_u(glyph_map *gm, uint32 utf32ch, const uint8 *utf8str) NONNULLPTRS;
 #endif /* ENHANCED_SYMBOLS */
+extern void reset_customsymbols(void);
 
 /* ### vault.c ### */
 

include/flag.h

@@ -376,6 +376,7 @@ struct instance_flags {
     boolean wizweight;       /* display weight of everything in wizard mode */
     boolean wizmgender;      /* test gender info from core in window port */
     boolean customcolors;    /* support customcolors defined in glyphmap */
+    boolean customsymbols;   /* support customsymbols defined in glyphmap */
     /*
      * Window capability support.
      */

include/optlist.h

@@ -253,6 +253,9 @@ static int optfn_##a(int, int, boolean, char *, char *);
     NHOPTB(customcolors, Map, 0, opt_out, set_in_game,
            On, Yes, No, No, "customcolours", &iflags.customcolors,
            Term_False, "use custom colors in map")
+    NHOPTB(customsymbols, Map, 0, opt_out, set_in_game,
+           On, Yes, No, No, "customsymbols", &iflags.customsymbols,
+           Term_False, "use custom utf8 symbols in map")
     NHOPTB(dark_room, Advanced, 0, opt_out, set_in_game,
            On, Yes, No, No, NoAlias, &flags.dark_room, Term_False,
            "show floor outside line of sight differently")

include/sym.h

@@ -129,6 +129,12 @@ enum graphics_sets {
         UNICODESET = NUM_GRAPHICS
 };
 
+enum do_customizations {
+       do_custom_none,
+       do_custom_colors,
+       do_custom_symbols
+};
+
 enum customization_types { custom_none, custom_symbols,
     custom_ureps, custom_nhcolor,  custom_count };