summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-ench.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-04-21 14:30:52 +0100
committerChris Campbell <chriscampbell89@gmail.com>2014-04-21 14:30:52 +0100
commitdafa99dbf3f413605e39bf5324d5515d4884723a (patch)
tree4f76f923f3e10e98d3cc746970d3b0143cb462e7 /crawl-ref/source/mon-ench.cc
parentb12d416045029ac6fd4b99d6e596a71a64a549b8 (diff)
downloadcrawl-ref-dafa99dbf3f413605e39bf5324d5515d4884723a.tar.gz
crawl-ref-dafa99dbf3f413605e39bf5324d5515d4884723a.zip
Make engulf interrupt recite and word of recall
Also move/update a recite comment.
Diffstat (limited to 'crawl-ref/source/mon-ench.cc')
-rw-r--r--crawl-ref/source/mon-ench.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index fd578756c1..eabc5b0ef4 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -1873,7 +1873,9 @@ void monster::apply_enchantment(const mon_enchant &me)
// cancel the recitation
if (silenced(pos()) || paralysed() || petrified()
|| confused() || asleep() || has_ench(ENCH_FEAR)
- || has_ench(ENCH_BREATH_WEAPON))
+ || has_ench(ENCH_BREATH_WEAPON)
+ || has_ench(ENCH_WATER_HOLD) && !res_water_drowning()
+ || has_ench(ENCH_MUTE))
{
this->speed_increment += me.duration;
del_ench(ENCH_WORD_OF_RECALL, true, false);