diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 21:30:42 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 22:04:09 -0600 |
| commit | d209dced6edfec770b03610e54a2836fb2bc0f30 (patch) | |
| tree | 131c8f4bddb17dad5ab719bfdb7d8f825d52f4d7 /crawl-ref/source/spl-cast.cc | |
| parent | 219ce41e6713bcdf4432f977a1fce0c770cee348 (diff) | |
| download | crawl-ref-d209dced6edfec770b03610e54a2836fb2bc0f30.tar.gz crawl-ref-d209dced6edfec770b03610e54a2836fb2bc0f30.zip | |
Properly split up unholy and evil items, reworking is_(unholy|evil)().
This is mainly for Fedhas, who hates the latter but not the former.
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index c9bfabc9fe..9a48b2ad31 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -825,11 +825,6 @@ static bool _spell_is_utility_spell(spell_type spell_id) SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION | SPTYP_DIVINATION)); } -static bool _spell_is_unholy(spell_type spell_id) -{ - return (testbits(get_spell_flags(spell_id), SPFLAG_UNHOLY)); -} - bool maybe_identify_staff(item_def &item, spell_type spell) { if (item_type_known(item)) @@ -946,7 +941,7 @@ static void _spellcasting_side_effects(spell_type spell, bool idonly = false) // Self-banishment gets a special exemption - you're there to spread // light. - if (_spell_is_unholy(spell) + if (is_unholy_spell(spell) && !you.banished && !crawl_state.is_god_acting()) { |