Merge branch 'master' into win32-x64-working

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

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));

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()
 {

src/options.c

@@ -743,6 +743,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;