From 0c49030637703359e9a4953c6fc2bd3d8a5352a5 Mon Sep 17 00:00:00 2001 From: Neil Moore Date: Thu, 7 Aug 2014 18:09:00 -0400 Subject: Don't let arrows melt, burn, or freeze themselves (rockygargoyle) --- crawl-ref/source/attack.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc index 443b057ff0..68e1e0381c 100644 --- a/crawl-ref/source/attack.cc +++ b/crawl-ref/source/attack.cc @@ -1929,7 +1929,8 @@ void attack::calc_elemental_brand_damage(beam_type flavour, what ? what : atk_name(DESC_THE).c_str(), what ? pluralise(verb).c_str() // XXX: may need to change this : attacker->conj_verb(verb).c_str(), - defender_name().c_str(), + // Don't allow reflexive if the subject wasn't the attacker. + (what ? def_name(DESC_THE) : defender_name()).c_str(), attack_strength_punctuation(special_damage).c_str()); } } -- cgit v1.2.3-54-g00ecf