summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-17 19:16:12 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-17 19:16:12 +0000
commit1f0e3e2749e11f5bab959ac8c504f64a3ce20f4c (patch)
treebb541a19fc1f3490ccec668345c77e04aba984f3 /crawl-ref/source/effects.cc
parenta15e97c27cb553d4a87c617da163ef7c1a68f6ec (diff)
downloadcrawl-ref-1f0e3e2749e11f5bab959ac8c504f64a3ce20f4c.tar.gz
crawl-ref-1f0e3e2749e11f5bab959ac8c504f64a3ce20f4c.zip
When annoying monsters affected by holy word, make them target the holy
word user instead of the player, as is done with torment already. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9603 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 2bccb6103a..c13c762222 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -153,7 +153,8 @@ int holy_word_monsters(coord_def where, int pow, int caster,
// Currently, holy word annoys the monsters it affects
// because it can kill them, and because hostile
// monsters don't use it.
- behaviour_event(monster, ME_ANNOY, MHITYOU);
+ if (attacker != NULL)
+ behaviour_event(monster, ME_ANNOY, attacker->mindex());
if (monster->speed_increment >= 25)
monster->speed_increment -= 20;