summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/fight.cc11
-rw-r--r--crawl-ref/source/mon-util.cc2
2 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index fd75a3471c..d3ec6e3725 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1488,10 +1488,11 @@ bool melee_attack::distortion_affects_defender()
if (one_chance_in(3))
{
- special_damage_message =
- make_stringf(
- "Space warps horribly around %s!",
- def_name(DESC_NOCAP_THE).c_str());
+ if (defender_visible)
+ special_damage_message =
+ make_stringf(
+ "Space warps horribly around %s!",
+ def_name(DESC_NOCAP_THE).c_str());
special_damage += 3 + random2avg(24, 2);
return (false);
@@ -2628,7 +2629,7 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
"touch",
"engulf",
"claw",
- "tail slap",
+ "tail-slap",
"butt"
};
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 9ffe0030ef..a3c6361caf 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -308,7 +308,7 @@ bool mons_is_stationary(const monsters *mons)
bool mons_is_icy(const monsters *mons)
{
- return (mons->is_icy());
+ return (mons_is_icy(mons->type));
}
bool mons_is_icy(int mtype)