summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/goditem.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/goditem.cc')
-rw-r--r--crawl-ref/source/goditem.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index f51d67d2eb..d8e547339f 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -252,7 +252,7 @@ bool is_evil_spell(spell_type spell, god_type god)
{
UNUSED(god);
- unsigned int flags = get_spell_flags(spell);
+ unsigned int flags = get_spell_flags(spell);
unsigned int disciplines = get_spell_disciplines(spell);
return ((flags & SPFLAG_UNHOLY) || (is_evil_discipline(disciplines)));
@@ -262,13 +262,9 @@ bool is_chaotic_spell(spell_type spell, god_type god)
{
UNUSED(god);
- return (spell == SPELL_POLYMORPH_OTHER
- || spell == SPELL_CORPSE_ROT
- || spell == SPELL_ALTER_SELF
- || spell == SPELL_SUMMON_UGLY_THING
- || spell == SPELL_MIASMA
- || spell == SPELL_SUMMON_DRAKES
- || spell == SPELL_PORKALATOR);
+ unsigned int flags = get_spell_flags(spell);
+
+ return (flags & SPFLAG_CHAOTIC);
}
bool is_hasty_spell(spell_type spell, god_type god)