[Hide Content]From 2adb89d3d25eb00a2b2f5ce55b4b7ab8b98a3e34 Mon Sep 17 00:00:00 2001
From: waylon531 <waylon531@gmail.com>
Date: Mon, 12 Jan 2015 19:07:16 -0800
Subject: [PATCH] Axes no longer cleave to neutral targets
---
crawl-ref/source/fight.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index b3184b1..89d1ee6 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -517,7 +517,8 @@ static bool _dont_harm(const actor* attacker, const actor* defender)
{
return mons_aligned(attacker, defender)
|| attacker == &you && defender->wont_attack()
- || defender == &you && attacker->wont_attack();
+ || defender == &you && attacker->wont_attack()
+ || mons_attitude(static_cast<const monster* >(defender)) == ATT_NEUTRAL;
}
/**
--
2.2.1