summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-08-07 18:48:20 -0400
committerNeil Moore <neil@s-z.org>2014-08-07 18:48:21 -0400
commit090fc3b240e1603021c2dd1ed25211d85c2428c9 (patch)
tree2ae5d0fda826f539b0f442379511e8ec5b642faa
parent0c49030637703359e9a4953c6fc2bd3d8a5352a5 (diff)
downloadcrawl-ref-090fc3b240e1603021c2dd1ed25211d85c2428c9.tar.gz
crawl-ref-090fc3b240e1603021c2dd1ed25211d85c2428c9.zip
Use reflexive in a few currently impossible cases.
Hydras chopping their own heads off, and AF_PURE_FIRE creatures burning themselves in melee.
-rw-r--r--crawl-ref/source/melee_attack.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index 36368910b4..5b7ebb788c 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -2143,10 +2143,10 @@ bool melee_attack::chop_hydra_head(int dam,
{
if (defender_visible)
{
- mprf("%s %s %s's last head off!",
+ mprf("%s %s %s last head off!",
atk_name(DESC_THE).c_str(),
attacker->conj_verb(verb).c_str(),
- def_name(DESC_THE).c_str());
+ apostrophise(defender_name()).c_str());
}
defender->as_monster()->number--;
@@ -2164,10 +2164,10 @@ bool melee_attack::chop_hydra_head(int dam,
{
if (defender_visible)
{
- mprf("%s %s one of %s's heads off!",
+ mprf("%s %s one of %s heads off!",
atk_name(DESC_THE).c_str(),
attacker->conj_verb(verb).c_str(),
- def_name(DESC_THE).c_str());
+ apostrophise(defender_name()).c_str());
}
defender->as_monster()->number--;
@@ -3294,7 +3294,7 @@ void melee_attack::mons_apply_attack_flavour()
mprf("%s %s %s!",
atk_name(DESC_THE).c_str(),
attacker->conj_verb("burn").c_str(),
- def_name(DESC_THE).c_str());
+ defender_name().c_str());
_print_resist_messages(defender, special_damage, BEAM_FIRE);
}