summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 02:31:37 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 02:31:37 +0000
commitb84750cf46f3a1eb537960085bc0a25f140d760d (patch)
tree15266945a3d6e5e7275fced1a85f240af3587d0e /crawl-ref/source/beam.cc
parent24dcf42aa81549a812a8a12372243877137460ad (diff)
downloadcrawl-ref-b84750cf46f3a1eb537960085bc0a25f140d760d.tar.gz
crawl-ref-b84750cf46f3a1eb537960085bc0a25f140d760d.zip
Check for cleansing flame resistance in bolt::nasty_to(), since it's the
one non-enchantment that may not be nasty to monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8528 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index d38fc3f648..206ebcf2c7 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -5348,7 +5348,11 @@ void bolt::determine_affected_cells(explosion_map& m, const coord_def& delta,
// straightforward.
bool bolt::nasty_to(const monsters *mon) const
{
- // Take care of non-enchantments.
+ // Cleansing flame.
+ if (flavour == BEAM_HOLY)
+ return (mon->res_cleansing_flame(agent()) <= 0);
+
+ // Take care of other non-enchantments.
if (!is_enchantment())
return (true);