Merge branch 'master' into win32-x64-working

2015-05-01 18:36:39 -04:00
parent bd68a6c80c d29ee35ae8
commit 088e0471f1
4 changed files with 12 additions and 0 deletions
--- a/src/options.c
+++ b/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;