summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-08 19:26:46 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-08 19:26:46 +0000
commit41e831e439bca35b4250cc60eebba5120910ccb8 (patch)
tree7dcb4328d76d92fbf13520c976a0cc9184103fd1 /crawl-ref/source/spells2.cc
parent88f3de6ef9a392e87a70d743e4bd5745ee25ad3e (diff)
downloadcrawl-ref-41e831e439bca35b4250cc60eebba5120910ccb8.tar.gz
crawl-ref-41e831e439bca35b4250cc60eebba5120910ccb8.zip
Really get the conducts right this time.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7194 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index fecb3fc22a..b4926f93fa 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -785,10 +785,13 @@ bool vampiric_drain(int pow, const dist &vmove)
{
set_attack_conducts(conducts, monster);
- behaviour_event(monster, ME_WHACK, MHITYOU, you.pos());
+ behaviour_event(monster, ME_ANNOY, MHITYOU, you.pos());
+ }
- enable_attack_conducts(conducts);
+ enable_attack_conducts(conducts);
+ if (success)
+ {
if (mons_is_unholy(monster))
{
mpr("Aaaarggghhhhh!");