diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2011-12-21 18:10:11 +0000 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2011-12-21 18:10:11 +0000 |
| commit | 7699f9670da38144f8b07e4f72c8fcc70e09af73 (patch) | |
| tree | 05bd30729fe9267e17fd37f1542caeddf2ec991b /crawl-ref/source/mon-speak.cc | |
| parent | db7808baeac2f77ee98abde4741170d461358548 (diff) | |
| download | crawl-ref-7699f9670da38144f8b07e4f72c8fcc70e09af73.tar.gz crawl-ref-7699f9670da38144f8b07e4f72c8fcc70e09af73.zip | |
Remove some misleading fake monster spells and use of canned messages
Diffstat (limited to 'crawl-ref/source/mon-speak.cc')
| -rw-r--r-- | crawl-ref/source/mon-speak.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc index 968e1687b7..130c8c13fd 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)); } @@ -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)) |