diff options
| author | Neil Moore <neil@s-z.org> | 2014-08-07 18:09:00 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-08-07 18:09:15 -0400 |
| commit | 0c49030637703359e9a4953c6fc2bd3d8a5352a5 (patch) | |
| tree | 67cdf5e4c0c4d2d1d6a344e5837d4fa40dc6f078 | |
| parent | 708f960817cd97c90d627e83010dde7118cacd08 (diff) | |
| download | crawl-ref-0c49030637703359e9a4953c6fc2bd3d8a5352a5.tar.gz crawl-ref-0c49030637703359e9a4953c6fc2bd3d8a5352a5.zip | |
Don't let arrows melt, burn, or freeze themselves (rockygargoyle)
| -rw-r--r-- | crawl-ref/source/attack.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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()); } } |