[1712555] [1712558] Prices of rings of slaying were being miscalculated; also

fixed being able to memorise spells while berserk (Rob Vollmert).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1408 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 5db4bbaf06..d9b9652ac4 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1149,7 +1149,13 @@ bool learn_spell(void)
         mpr("You are too confused!");
         return (false);
     }
-    
+
+    if (you.berserker)
+    {
+        canned_msg(MSG_TOO_BERSERK);
+        return (false);
+    }
+
     if (!which_spellbook( book, spell ))
         return (false);