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/spells2.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/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index a1ea78180f..bc5ce39e56 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -680,7 +680,7 @@ void drain_life(int pow) monsters* monster = &menv[i]; if (!monster->alive() - || mons_holiness(monster) != MH_NATURAL + || monster->holiness() != MH_NATURAL || monster->res_negative_energy()) { continue; @@ -746,14 +746,14 @@ bool vampiric_drain(int pow, const dist &vmove) return (false); } - if (mons_is_unholy(monster)) + if (monster->is_unholy()) { mpr("Aaaarggghhhhh!"); dec_hp(random2avg(39, 2) + 10, false, "vampiric drain backlash"); return (false); } - if (mons_holiness(monster) != MH_NATURAL + if (monster->holiness() != MH_NATURAL || monster->res_negative_energy()) { canned_msg(MSG_NOTHING_HAPPENS); |