diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-02 23:38:56 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-02 23:38:56 +0000 |
| commit | 077e48644d51965089e33c70c59f22db0d471faf (patch) | |
| tree | d9fee034445605f15cad5b8c01534d88522ba358 /crawl-ref/source | |
| parent | 8e2ad2a8fd055a911de7b176c1e5f1ec44d3b803 (diff) | |
| download | crawl-ref-077e48644d51965089e33c70c59f22db0d471faf.tar.gz crawl-ref-077e48644d51965089e33c70c59f22db0d471faf.zip | |
Remove unused references to the Book of Healing.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7092 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/enum.h | 6 | ||||
| -rw-r--r-- | crawl-ref/source/itemname.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/spl-book.cc | 5 |
4 files changed, 4 insertions, 11 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index da9532daad..3b5f95872e 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -267,7 +267,7 @@ enum book_type BOOK_PRACTICAL_MAGIC, BOOK_WAR_CHANTS, // 20 BOOK_CLOUDS, - BOOK_HEALING, + BOOK_HEALING, // XXX: not used BOOK_NECROMANCY, BOOK_NECRONOMICON, BOOK_CALLINGS, // 25 @@ -1679,7 +1679,7 @@ enum monster_type // (int) menv[].type MONS_GIANT_COCKROACH, MONS_SMALL_SNAKE, //jmf: new monsters - MONS_SHUGGOTH, //jmf: added for evil spells + MONS_SHUGGOTH, // XXX: not used MONS_WOLF, //jmf: added MONS_WARG, //jmf: added for orc mines MONS_BEAR, //jmf: added bears! @@ -1728,7 +1728,7 @@ enum monster_type // (int) menv[].type MONS_LOM_LOBON, MONS_CEREBOV, MONS_GLOORX_VLOQ, // 254 - MONS_MOLLUSC_LORD, // 255 - deprecated, but still referenced in code {dlb} + MONS_MOLLUSC_LORD, // XXX: not used // 256 // 257 // 258 diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 2d44e0a951..13900e0556 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -856,7 +856,6 @@ static const char* book_type_name(int booktype) case BOOK_PRACTICAL_MAGIC: return "Practical Magic"; case BOOK_WAR_CHANTS: return "War Chants"; case BOOK_CLOUDS: return "Clouds"; - case BOOK_HEALING: return "Healing"; case BOOK_NECROMANCY: return "Necromancy"; case BOOK_CALLINGS: return "Callings"; case BOOK_CHARMS: return "Charms"; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 1b927c1400..6ba88aa040 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3071,9 +3071,6 @@ bool is_holy_item(const item_def& item) case OBJ_SCROLLS: retval = (item.sub_type == SCR_HOLY_WORD); break; - case OBJ_BOOKS: - retval = (item.sub_type == BOOK_HEALING); - break; default: break; } diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 6533ebea5f..4efa85e260 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -928,13 +928,10 @@ int book_rarity(unsigned char which_book) case BOOK_DESTRUCTION: return 30; - case BOOK_HEALING: - return 100; - default: return 1; } -} // end book_rarity() +} bool is_valid_spell_in_book( int splbook, int spell ) { |