diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 19:00:59 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 19:00:59 -0600 |
| commit | 7f330c97c7554469b06a102542d2bad40d730bcd (patch) | |
| tree | b1bd1d781ca22d1b6d5f46d2488ece41622c4deb /crawl-ref/source/goditem.cc | |
| parent | c12391f6964206972df7f2fceff7abe59eec3969 (diff) | |
| download | crawl-ref-7f330c97c7554469b06a102542d2bad40d730bcd.tar.gz crawl-ref-7f330c97c7554469b06a102542d2bad40d730bcd.zip | |
Simplify some spell discipline checks.
Diffstat (limited to 'crawl-ref/source/goditem.cc')
| -rw-r--r-- | crawl-ref/source/goditem.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc index 0ed9ec196d..3ea38375d9 100644 --- a/crawl-ref/source/goditem.cc +++ b/crawl-ref/source/goditem.cc @@ -113,13 +113,13 @@ bool is_evil_item(const item_def& item) case OBJ_WANDS: retval = (item.sub_type == WAND_DRAINING); break; + case OBJ_POTIONS: + retval = is_blood_potion(item); + break; case OBJ_SCROLLS: retval = (item.sub_type == SCR_SUMMONING || item.sub_type == SCR_TORMENT); break; - case OBJ_POTIONS: - retval = is_blood_potion(item); - break; case OBJ_BOOKS: retval = is_evil_spellbook(item); break; @@ -508,7 +508,7 @@ bool god_hates_spell_type(spell_type spell, god_type god) break; case GOD_FEDHAS: - if (disciplines & SPTYP_NECROMANCY) + if (is_evil_discipline(disciplines)) return (true); break; @@ -598,7 +598,7 @@ bool god_dislikes_spell_discipline(int discipline, god_type god) return (discipline & SPTYP_POISON); case GOD_YREDELEMNUL: - return (discipline & SPTYP_HOLY); + return (is_holy_discipline(discipline)); case GOD_XOM: return (discipline & (SPTYP_DIVINATION | SPTYP_HOLY)); @@ -607,7 +607,7 @@ bool god_dislikes_spell_discipline(int discipline, god_type god) return (discipline & (SPTYP_CONJURATION | SPTYP_SUMMONING)); case GOD_FEDHAS: - return (discipline & SPTYP_NECROMANCY); + return (is_evil_discipline(discipline)); default: break; |