FR 2810959: If a player reads a spellbook which is in inventory, then looks at

    a spell's description, pressing 'M' will try to memorise that spell from
    that particular book.

FR 2815575: Instead of moving "spell levels left" to the top of the spell
    memorisation menu, make it light-green in color.


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

1 files changed, 5 insertions, 1 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 3779037005..c5cbc035f2 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4667,7 +4667,11 @@ static void handle_read_book(int item_slot)
             return;
         }
 
-        describe_spell(spell);
+        describe_spell(spell, &book);
+
+        // Player memorised spell which was being looked at.
+        if (you.turn_is_over)
+            return;
     }
 }