diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 15:08:00 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 15:09:10 -0500 |
commit | a418d15295dfc484bdeef463ef6678424981b224 (patch) | |
tree | 0e21c1fa45e4acf5a321582a10510b38d49ebc93 /crawl-ref/source/spells4.cc | |
parent | c96b1349887c237d78ab6f3cbaa3967c1fe31bbe (diff) | |
download | crawl-ref-a418d15295dfc484bdeef463ef6678424981b224.tar.gz crawl-ref-a418d15295dfc484bdeef463ef6678424981b224.zip |
Merge mons_holiness() into monster::holiness(), and add an is_unholy()
convenience function.
Diffstat (limited to 'crawl-ref/source/spells4.cc')
-rw-r--r-- | crawl-ref/source/spells4.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 3d281652b2..160fee75b1 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -393,7 +393,7 @@ static int _sleep_monsters(coord_def where, int pow, int, actor *) if (monster == NULL) return (0); - if (mons_holiness(monster) != MH_NATURAL) + if (monster->holiness() != MH_NATURAL) return (0); if (check_mons_resist_magic(monster, pow)) return (0); @@ -1002,7 +1002,7 @@ static int _intoxicate_monsters(coord_def where, int pow, int, actor *) monsters *monster = monster_at(where); if (monster == NULL || mons_intel(monster) < I_NORMAL - || mons_holiness(monster) != MH_NATURAL + || monster->holiness() != MH_NATURAL || monster->res_poison() > 0) { return 0; |