summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-30 11:22:39 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-30 11:22:39 +0000
commita5158ef501e2220533d9e07826524e9204c0d30c (patch)
tree1555a4d8219bb228500ca8a9f138acb440e8412b /crawl-ref/source/beam.cc
parentbdcd305d09236d064dfd0dd695dd4f4a0f205030 (diff)
downloadcrawl-ref-a5158ef501e2220533d9e07826524e9204c0d30c.tar.gz
crawl-ref-a5158ef501e2220533d9e07826524e9204c0d30c.zip
Missed beams from monsters now trigger AI_MONSTER_ATTACKS interrupt.
Fixes 1841439. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2946 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index a310f77c8c..faebaa28fa 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -36,6 +36,7 @@
#include "cio.h"
#include "cloud.h"
+#include "delay.h"
#include "effects.h"
#include "enum.h"
#include "it_use2.h"
@@ -3114,6 +3115,11 @@ static int affect_player( bolt &beam )
return (range_used_on_hit(beam));
}
+ // Trigger an interrupt, so travel will stop on misses
+ // which generate smoke.
+ if (!YOU_KILL(beam.thrower))
+ interrupt_activity(AI_MONSTER_ATTACKS);
+
// BEGIN real beam code
beam.msg_generated = true;