Fix [2514815]: better messaging for Transmutatin miscasts.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8898 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 5 deletions

diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc
index 3ba48c3c87..00833dd8f0 100644
--- a/crawl-ref/source/spl-mis.cc
+++ b/crawl-ref/source/spl-mis.cc
@@ -396,7 +396,7 @@ void MiscastEffect::do_miscast()
         xom_is_stimulated(severity * 50);
 }
 
-void MiscastEffect::do_msg(bool suppress_nothing_happnes)
+void MiscastEffect::do_msg(bool suppress_nothing_happens)
 {
     ASSERT(!did_msg);
 
@@ -431,7 +431,7 @@ void MiscastEffect::do_msg(bool suppress_nothing_happnes)
 
     if (msg.empty())
     {
-        if (!suppress_nothing_happnes
+        if (!suppress_nothing_happens
             && (nothing_happens_when == NH_ALWAYS
                 || (nothing_happens_when == NH_DEFAULT && source_known
                     && target_known)))
@@ -1921,10 +1921,12 @@ void MiscastEffect::_transmutation(int severity)
             if (target->atype() == ACT_PLAYER)
             {
                 you_msg = "Your body is distorted in a weirdly horrible way!";
-                const bool failMsg = !give_bad_mutation(true, false,
-                                                        lethality_margin > 0);
+                // We don't need messages when the mutation fails,
+                // because we give our own (which is justified anyway as
+                // you take damage.)
+                give_bad_mutation(false, false, lethality_margin > 0);
                 if (coinflip())
-                    give_bad_mutation(failMsg, false, lethality_margin > 0);
+                    give_bad_mutation(false, false, lethality_margin > 0);
             }
             _ouch(5 + random2avg(23, 2));
             break;