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/effects.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/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index ffca8c92c9..82de3a69f9 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -64,7 +64,7 @@ int holy_word_player(int pow, int caster, actor *attacker) { - if (!player_is_unholy()) + if (!you.is_unholy()) return (0); int hploss; @@ -126,7 +126,7 @@ int holy_word_monsters(coord_def where, int pow, int caster, if (monster == NULL) return (retval); - if (!monster->alive() || !mons_is_unholy(monster)) + if (!monster->alive() || !monster->is_unholy()) return (retval); int hploss; @@ -296,7 +296,7 @@ int torment_monsters(coord_def where, int pow, int caster, actor *attacker) if (monster == NULL) return (retval); - if (!monster->alive() || monster->res_negative_energy() == 3) + if (!monster->alive() || monster->res_torment()) return (retval); int hploss = std::max(0, monster->hit_points / 2 - 1); |