summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-08 19:17:11 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-08 19:17:11 +0000
commit9aef1290d58dd282eb25ae663a55b089e4eac378 (patch)
tree8bc844239e0ff171ba7dfb320bac03af31f3acd6 /crawl-ref/source/spells2.cc
parent99e98160d304efc49fcf48f905bbe3fa5c56c990 (diff)
downloadcrawl-ref-9aef1290d58dd282eb25ae663a55b089e4eac378.tar.gz
crawl-ref-9aef1290d58dd282eb25ae663a55b089e4eac378.zip
And enable the "attack friend" conduct in the right place.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7191 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index d8264d3d2c..a3fb391407 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -785,6 +785,8 @@ bool vampiric_drain(int pow, const dist &vmove)
{
set_attack_conducts(conducts, monster);
+ behaviour_event(monster, ME_ANNOY, MHITYOU, you.pos());
+
if (mons_is_unholy(monster))
{
mpr("Aaaarggghhhhh!");
@@ -813,7 +815,6 @@ bool vampiric_drain(int pow, const dist &vmove)
mprf("You feel life coursing from %s into your body!",
monster->name(DESC_NOCAP_THE).c_str());
- behaviour_event(monster, ME_ANNOY, MHITYOU, you.pos());
monster->hurt(&you, inflicted);
if (monster->alive())