summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-09 12:13:40 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-09 12:13:40 -0600
commitd04ebcaf6c3b9a75db6e3bdad0ff6e02e9b6f031 (patch)
tree0c245b5f53e372ee9dbd9bc26f61cec53f6be5c8
parent0f824030c051a780ec314efc75472dd0f2d6fd1f (diff)
downloadcrawl-ref-d04ebcaf6c3b9a75db6e3bdad0ff6e02e9b6f031.tar.gz
crawl-ref-d04ebcaf6c3b9a75db6e3bdad0ff6e02e9b6f031.zip
Reorder entries in _get_spellbook_list().
-rw-r--r--crawl-ref/source/mon-util.cc44
1 files changed, 22 insertions, 22 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 458d2005b3..c7e0721e20 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1374,13 +1374,14 @@ static bool _get_spellbook_list(mon_spellbook_type book[6],
switch (mon_type)
{
- case MONS_DEEP_ELF_FIGHTER:
- case MONS_DEEP_ELF_KNIGHT:
- case MONS_DEEP_ELF_SOLDIER:
- case MONS_ORC_WIZARD:
- book[0] = MST_ORC_WIZARD_I;
- book[1] = MST_ORC_WIZARD_II;
- book[2] = MST_ORC_WIZARD_III;
+ case MONS_DEEP_ELF_CONJURER:
+ book[0] = MST_DEEP_ELF_CONJURER_I;
+ book[1] = MST_DEEP_ELF_CONJURER_II;
+ break;
+
+ case MONS_HELL_KNIGHT:
+ book[0] = MST_HELL_KNIGHT_I;
+ book[1] = MST_HELL_KNIGHT_II;
break;
case MONS_LICH:
@@ -1391,16 +1392,20 @@ static bool _get_spellbook_list(mon_spellbook_type book[6],
book[3] = MST_LICH_IV;
break;
- case MONS_HELL_KNIGHT:
- book[0] = MST_HELL_KNIGHT_I;
- book[1] = MST_HELL_KNIGHT_II;
- break;
-
case MONS_NECROMANCER:
book[0] = MST_NECROMANCER_I;
book[1] = MST_NECROMANCER_II;
break;
+ case MONS_ORC_WIZARD:
+ case MONS_DEEP_ELF_SOLDIER:
+ case MONS_DEEP_ELF_FIGHTER:
+ case MONS_DEEP_ELF_KNIGHT:
+ book[0] = MST_ORC_WIZARD_I;
+ book[1] = MST_ORC_WIZARD_II;
+ book[2] = MST_ORC_WIZARD_III;
+ break;
+
case MONS_WIZARD:
case MONS_OGRE_MAGE:
case MONS_EROLCHA:
@@ -1412,18 +1417,13 @@ static bool _get_spellbook_list(mon_spellbook_type book[6],
book[4] = MST_WIZARD_V;
break;
- case MONS_DEEP_ELF_CONJURER:
+ case MONS_DRACONIAN_KNIGHT:
book[0] = MST_DEEP_ELF_CONJURER_I;
book[1] = MST_DEEP_ELF_CONJURER_II;
- break;
-
- case MONS_DRACONIAN_KNIGHT:
- book[0] = MST_HELL_KNIGHT_I;
- book[1] = MST_HELL_KNIGHT_II;
- book[2] = MST_NECROMANCER_I;
- book[3] = MST_NECROMANCER_II;
- book[4] = MST_DEEP_ELF_CONJURER_I;
- book[5] = MST_DEEP_ELF_CONJURER_II;
+ book[2] = MST_HELL_KNIGHT_I;
+ book[3] = MST_HELL_KNIGHT_II;
+ book[4] = MST_NECROMANCER_I;
+ book[5] = MST_NECROMANCER_II;
break;
default: