fix OPTIONS=symset:default, roguesymset:RogueEpyx

diff --git a/doc/fixes36.2 b/doc/fixes36.2
index e24aaf388c05fe018c6ad6a23c53790b4ee180da..1be86f1a7d4397873912552abd0752b9512c5057 100644 (file)
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -312,6 +312,10 @@ fix foxen pluralization again after underflow remedy reintroduced the problem
 fix "placing monster over another?" warning for vault guards
 status highlighting classifies gold, time, and experience-points as data type
        'long' but when selecting hilite rule to use treated them as 'int'
+a config file line with OPTIONS=symset:default, roguesymset:RogueEpyx
+       was disabling color on RogueEpyx even though the symset is 
+       meant to have color due to an errant init_symbols() during the
+       processing of symset:default after already processing RogueEpyx
 tty: turn off an optimization that is the suspected cause of Windows reported
        partial status lines following level changes
 tty: ensure that current status fields are always copied to prior status

diff --git a/src/drawing.c b/src/drawing.c
index 5a73d4c3f0fdb842d9dfd6650ee250b89f8dc7d9..e9dd2481dad5afc3d54fe3bea35a3aa7cbcbe2c2 100644 (file)
--- a/src/drawing.c
+++ b/src/drawing.c
@@ -503,8 +503,10 @@ int nondefault;
         if (SYMHANDLING(H_CURS) && cursesgraphics_mode_callback)
             (*cursesgraphics_mode_callback)();         
 # endif
-    } else
-        init_symbols();
+    } else {
+        init_l_symbols();
+        init_showsyms();
+    }
 }
 
 void

diff --git a/src/options.c b/src/options.c
index ead3a707aa7fd3938afaf2f82c8398335c07db71..17965cb058e8318799586fafe053df145fb4f6b2 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -761,6 +761,7 @@ initoptions_init()
     for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++)
         flags.end_disclose[i] = DISCLOSE_PROMPT_DEFAULT_NO;
     switch_symbols(FALSE); /* set default characters */
+    init_r_symbols();
 #if defined(UNIX) && defined(TTY_GRAPHICS)
     /*
      * Set defaults for some options depending on what we can