From 5e79f8c4255b24df79564a56f4ab7d326534cc3b Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 2 Mar 2024 05:50:44 -0800 Subject: [PATCH] fix #K4113 - OPTIONS=symset:blank in RC file Any plain text symbol set specified in .nethackrc or NETHACKOPTIONS didn't get loaded but did set the symset name. Faulty 'if' logic excluded loading of symbol sets that used the default handling type of H_UNK. --- doc/fixes3-7-0.txt | 2 ++ src/options.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index 41734cdd1..9a6880644 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1879,6 +1879,8 @@ Warning didn't show nearby monsters who were inside poison gas/steam/smoke map didn't show adjacent monsters if they were inside a gas region unless they were seen via telepathy or extended monster detection, but they were described as if visible in messages (combat, for instance) +OPTIONS=symset:blank and symset:plain didn't load the specified symbols if + used from the RC file or NETHACKOPTIONS Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository diff --git a/src/options.c b/src/options.c index d91f330c6..6cfe511bf 100644 --- a/src/options.c +++ b/src/options.c @@ -4058,9 +4058,9 @@ optfn_symset( load_symset("default", PRIMARYSET); } #endif - switch_symbols(gs.symset[PRIMARYSET].name != (char *) 0); - go.opt_need_redraw = go.opt_need_glyph_reset = TRUE; } + switch_symbols(gs.symset[PRIMARYSET].name != (char *) 0); + go.opt_need_redraw = go.opt_need_glyph_reset = TRUE; } } else return optn_err;