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/spells1.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/spells1.cc')
-rw-r--r-- | crawl-ref/source/spells1.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 40fdc8bcf5..06225193b4 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -671,7 +671,7 @@ static bool _can_pacify_monster(const monsters *mon, const int healed) if (mons_intel(mon) <= I_PLANT) // no self-awareness return (false); - const mon_holy_type holiness = mons_holiness(mon); + const mon_holy_type holiness = mon->holiness(); if (holiness != MH_HOLY && holiness != MH_NATURAL |