Removed unnecessary turnloss when declining to memorise a spell. Also removed

turnloss when trying to memorise spells that you already know, or that are too
high-level, or need too many slots.

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

1 files changed, 0 insertions, 7 deletions

diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 507fa1b4a6..f904ee2a70 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1051,10 +1051,6 @@ unsigned char read_book( item_def &book, int action )
     /* Put special book effects in another function which can be called from
        memorise as well */
 
-    // reading spell descriptions doesn't take time:
-    if (action != RBOOK_READ_SPELL)
-        you.turn_is_over = true;
-
     set_ident_flags( book, ISFLAG_KNOW_TYPE );
 
     return (key2);
@@ -1209,7 +1205,6 @@ bool learn_spell(void)
         if (you.spells[i] == specspell)
         {
             mpr("You already know that spell!");
-            you.turn_is_over = true;
             return (false);
         }
     }
@@ -1219,14 +1214,12 @@ bool learn_spell(void)
     if (player_spell_levels() < levels_needed)
     {
         mpr("You can't memorise that many levels of magic yet!");
-        you.turn_is_over = true;
         return (false);
     }
 
     if (you.experience_level < spell_difficulty(specspell))
     {
         mpr("You're too inexperienced to learn that spell!");
-        you.turn_is_over = true;
         return (false);
     }