Generalize checks for spellbooks and rods of a particular class, or

which your god disapproves of.  Now, if at least half of the spells in a 
spellbook or rod are in a particular class (this threshold may need 
adjustment; it's in is_spellbook_type()), the entire item is considered 
to be, too.  This means that artefact spellbooks containing many evil 
spells may be considered evil items by good gods, as will artefact rods 
if/when they're implemented.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index dfd3db7e3b..dad9800e5d 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -982,10 +982,10 @@ static unsigned char _lowest_rarity[NUM_SPELLS];
 
 void init_spell_rarities()
 {
-    for (int i = 0; i < NUM_SPELLS; i++)
+    for (int i = 0; i < NUM_SPELLS; ++i)
         _lowest_rarity[i] = 255;
 
-    for (int i = 0; i < NUM_FIXED_BOOKS; i++)
+    for (int i = 0; i < NUM_FIXED_BOOKS; ++i)
     {
         const int rarity = book_rarity(i);
 
@@ -994,14 +994,14 @@ void init_spell_rarities()
         if (rarity >= 20)
             continue;
 
-        for (int j = 0; j < SPELLBOOK_SIZE; j++)
+        for (int j = 0; j < SPELLBOOK_SIZE; ++j)
         {
             spell_type spell = which_spell_in_book(i, j);
             if (spell == SPELL_NO_SPELL)
                 continue;
 
 #ifdef DEBUG
-            int unsigned flags = get_spell_flags(spell);
+            unsigned int flags = get_spell_flags(spell);
 
             if (flags & (SPFLAG_MONSTER | SPFLAG_TESTING))
             {