summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-31 21:20:04 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-31 21:20:04 +0000
commitdf2252332c751342de283f3cc32ff5c34d3b8a53 (patch)
treecf680e94719191ea796d9c32660c62b3c550f353
parentbff4804a011d74ec26dc2dc1a29c559a548c9098 (diff)
downloadcrawl-ref-df2252332c751342de283f3cc32ff5c34d3b8a53.tar.gz
crawl-ref-df2252332c751342de283f3cc32ff5c34d3b8a53.zip
Backport trunk r9871 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9872 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monstuff.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index ad1c58d981..94d5656559 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1458,7 +1458,7 @@ int monster_die(monsters *monster, killer_type killer,
if (killer_holy == MH_UNDEAD)
{
const bool confused =
- anon ? true : !mons_friendly(killer_mon);
+ anon ? false : !mons_friendly(killer_mon);
// Yes, these are hacks, but they make sure that
// confused monsters doing kills are not
@@ -1527,7 +1527,7 @@ int monster_die(monsters *monster, killer_type killer,
if (killer_holy == MH_UNDEAD)
{
const bool confused =
- anon ? true : !mons_friendly(killer_mon);
+ anon ? false : !mons_friendly(killer_mon);
// Yes, this is a hack, but it makes sure that
// confused monsters doing kills are not