FR 2722830 and related changes:

* Memorization now lists all spells in all carried books (minus spells
  which are already memorized or which can never be memorized because of
  the player's species), sorted by easy of memorization.

* Miscast effects from failing to memorize from out of the Necronomicon,
  the book of Demonology and the book of Annihilations is commented out,
  pending figuring out how to do it with the new interface.

* Spells which can't be memorized because of the player's species are
  highlighted as light red when reading a spell book, and a note is added
  when describing the spell.


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

1 files changed, 8 insertions, 9 deletions

diff --git a/crawl-ref/source/invent.h b/crawl-ref/source/invent.h
index ac58610c62..2f64cf9d59 100644
--- a/crawl-ref/source/invent.h
+++ b/crawl-ref/source/invent.h
@@ -22,15 +22,14 @@ enum object_selector
     OSEL_WIELD       =  -2,
     OSEL_UNIDENT     =  -3,
     OSEL_EQUIP       =  -4,
-    OSEL_MEMORISE    =  -5,
-    OSEL_RECHARGE    =  -6,
-    OSEL_ENCH_ARM    =  -7,
-    OSEL_VAMP_EAT    =  -8,
-    OSEL_DRAW_DECK   =  -9,
-    OSEL_THROWABLE   = -10,
-    OSEL_BUTCHERY    = -11,
-    OSEL_EVOKABLE    = -12,
-    OSEL_WORN_ARMOUR = -13
+    OSEL_RECHARGE    =  -5,
+    OSEL_ENCH_ARM    =  -6,
+    OSEL_VAMP_EAT    =  -7,
+    OSEL_DRAW_DECK   =  -8,
+    OSEL_THROWABLE   =  -9,
+    OSEL_BUTCHERY    = -10,
+    OSEL_EVOKABLE    = -11,
+    OSEL_WORN_ARMOUR = -12
 };
 
 #define PROMPT_ABORT        -1