diff options
| author | Neil Moore <neil@s-z.org> | 2014-08-07 19:01:07 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-08-07 19:11:12 -0400 |
| commit | 82a59c624277434f08455446f635b8875c891a9b (patch) | |
| tree | 1770b40096fce84c621a91381d3b881403424932 /crawl-ref/source/ranged_attack.cc | |
| parent | 2a679c6e77b2e24b41d3adb469d4835b6501c8fd (diff) | |
| download | crawl-ref-82a59c624277434f08455446f635b8875c891a9b.tar.gz crawl-ref-82a59c624277434f08455446f635b8875c891a9b.zip | |
Tweak defender_name method and use it more.
Have it take a parameter indicating whether reflexive is allowed, and
replace existing calls to defender_name() and def_name(DESC_THE).
Diffstat (limited to 'crawl-ref/source/ranged_attack.cc')
| -rw-r--r-- | crawl-ref/source/ranged_attack.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/ranged_attack.cc b/crawl-ref/source/ranged_attack.cc index d08bfdb751..43a0bce594 100644 --- a/crawl-ref/source/ranged_attack.cc +++ b/crawl-ref/source/ranged_attack.cc @@ -194,7 +194,7 @@ bool ranged_attack::handle_phase_blocked() if (needs_message) { mprf("%s %s %s%s", - def_name(DESC_THE).c_str(), + defender_name(false).c_str(), defender->conj_verb(verb).c_str(), projectile->name(DESC_THE).c_str(), punctuation.c_str()); @@ -256,8 +256,7 @@ bool ranged_attack::handle_phase_dodged() mprf("%s%s misses %s%s", projectile->name(DESC_THE).c_str(), evasion_margin_adverb().c_str(), - // Not defender_name because reflexive is bad here. - def_name(DESC_THE).c_str(), + defender_name(false).c_str(), attack_strength_punctuation(damage_done).c_str()); } @@ -406,8 +405,7 @@ bool ranged_attack::attack_ignores_shield(bool verbose) { mprf("%s pierces through %s %s!", projectile->name(DESC_THE).c_str(), - // Not defender_name because reflexive is bad here. - apostrophise(def_name(DESC_THE)).c_str(), + apostrophise(defender_name(false)).c_str(), defender_shield ? defender_shield->name(DESC_PLAIN).c_str() : "shielding"); } @@ -875,8 +873,7 @@ void ranged_attack::announce_hit() mprf("%s %s %s%s%s%s", projectile->name(DESC_THE).c_str(), attack_verb.c_str(), - // Not defender_name because reflexive is bad here. - def_name(DESC_THE).c_str(), + defender_name(false).c_str(), damage_done > 0 && stab_attempt && stab_bonus > 0 ? " in a vulnerable spot" : "", |