Merge branch 'master' into portal_branches

1 files changed, 1 insertions, 15 deletions

diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc
index 6a0a548658..93e7ca5f98 100644
--- a/crawl-ref/source/mon-speak.cc
+++ b/crawl-ref/source/mon-speak.cc
@@ -824,16 +824,6 @@ bool mons_speaks(monster* mons)
         return (false);
     }
 
-    if (foe == NULL)
-        msg = replace_all(msg, "__YOU_RESIST", "__NOTHING_HAPPENS");
-    else if (foe->atype() == ACT_MONSTER)
-    {
-        if (you.can_see(foe))
-            msg = replace_all(msg, "__YOU_RESIST", "@The_monster@ resists.");
-        else
-            msg = replace_all(msg, "__YOU_RESIST", "__NOTHING_HAPPENS");
-    }
-
     return (mons_speaks_msg(mons, msg, MSGCH_TALK, silence));
 }
 
@@ -857,7 +847,7 @@ bool mons_speaks_msg(monster* mons, const std::string &msg,
 
         // This function is a little bit of a problem for the message
         // channels since some of the messages it generates are "fake"
-        // warning to scare the player.  In order to accomodate this
+        // warning to scare the player.  In order to accommodate this
         // intent, we're falsely categorizing various things in the
         // function as spells and danger warning... everything else
         // just goes into the talk channel -- bwr
@@ -880,10 +870,6 @@ bool mons_speaks_msg(monster* mons, const std::string &msg,
         // Except for VISUAL, none of the above influence these.
         if (msg_type == MSGCH_TALK_VISUAL)
             silence = false;
-        if (line == "__YOU_RESIST" && !silence)
-            canned_msg(MSG_YOU_RESIST);
-        else if (line == "__NOTHING_HAPPENS" && !silence)
-            canned_msg(MSG_NOTHING_HAPPENS);
         else if (line == "__MORE" && !silence)
             more();
         else if (msg_type == MSGCH_TALK_VISUAL && !you.can_see(mons))