summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/fight.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 8aef88b8a3..5c5bb75b70 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -3332,6 +3332,12 @@ bool melee_attack::apply_damage_brand()
case SPWPN_CONFUSE:
{
+ // This was originally for confusing touch and it doesn't really
+ // work on the player, but a monster with a chaos weapon will
+ // occassionally come up with this brand. -cao
+ if (defender->atype() == ACT_PLAYER)
+ break;
+
emit_nodmg_hit_message();
const int hdcheck =