From 8f639796d502e0513652b0ebd7ca8f8d38617407 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 1 May 2015 22:03:10 +0300 Subject: [PATCH 1/2] Handle boulder-option in config file Setting boulder in config file did not work correctly in post-3.4.3 code, due to the symset changes. --- include/extern.h | 1 + src/drawing.c | 8 ++++++++ src/options.c | 2 ++ 3 files changed, 11 insertions(+) diff --git a/include/extern.h b/include/extern.h index a185be710..741de9138 100644 --- a/include/extern.h +++ b/include/extern.h @@ -515,6 +515,7 @@ E void FDECL(switch_symbols, (int)); E void FDECL(assign_graphics, (int)); E void NDECL(init_r_symbols); E void NDECL(init_symbols); +E void NDECL(update_bouldersym); E void NDECL(init_showsyms); E void NDECL(init_l_symbols); E void FDECL(clear_symsetentry, (int,BOOLEAN_P)); diff --git a/src/drawing.c b/src/drawing.c index d78668e0a..7967831d3 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -350,6 +350,14 @@ init_symbols() init_r_symbols(); } +void +update_bouldersym() +{ + showsyms[SYM_BOULDER + SYM_OFF_X] = iflags.bouldersym; + l_syms[SYM_BOULDER + SYM_OFF_X] = iflags.bouldersym; + r_syms[SYM_BOULDER + SYM_OFF_X] = iflags.bouldersym; +} + void init_showsyms() { diff --git a/src/options.c b/src/options.c index cc27a00f7..ec14cf766 100644 --- a/src/options.c +++ b/src/options.c @@ -744,6 +744,8 @@ initoptions_finish() /* result in the player's preferred fruit [better than "\033"]. */ obj_descr[SLIME_MOLD].oc_name = "fruit"; + if (iflags.bouldersym) update_bouldersym(); + reglyph_darkroom(); return; From d29ee35ae8e76d9c33fea3b69c359837a6d97c55 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 1 May 2015 18:34:06 -0400 Subject: [PATCH 2/2] fixes entry for previous bubble fix Changes to be committed: modified: doc/fixes35.0 --- doc/fixes35.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/fixes35.0 b/doc/fixes35.0 index 02f3e4e8d..6b853e1f1 100644 --- a/doc/fixes35.0 +++ b/doc/fixes35.0 @@ -906,6 +906,7 @@ shopkeepers give honorifics to vampires and elves when commands (D, A, object identify) mix object class filtering with BUCX filtering, take the intersection rather than the union (so ?B picks blessed scrolls rather than all scrolls plus blessed everything) +bmask is stored with the objects on the Plane of Water to prevent segfault Platform- and/or Interface-Specific Fixes