summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-speak.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-04-12 03:09:08 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-04-12 03:09:08 +0200
commit64d4ef277c5500fa5b4f65a6a96768605ec6fd75 (patch)
tree8487dfd6b4af109efadcc60a88fccfb433f69d5a /crawl-ref/source/mon-speak.cc
parent7ff52721aa186489a3a27074a2e95e9f0471eb02 (diff)
parent3e11d7d1fd1154c0c458eb8482c56aae6c69b7ea (diff)
downloadcrawl-ref-64d4ef277c5500fa5b4f65a6a96768605ec6fd75.tar.gz
crawl-ref-64d4ef277c5500fa5b4f65a6a96768605ec6fd75.zip
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/mon-speak.cc')
-rw-r--r--crawl-ref/source/mon-speak.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc
index 56e9098397..623376e976 100644
--- a/crawl-ref/source/mon-speak.cc
+++ b/crawl-ref/source/mon-speak.cc
@@ -429,6 +429,10 @@ bool mons_speaks(monster* mons)
if (mons->berserk())
return (false);
+ // Rolling beetles shouldn't twitch antennae
+ if (mons->rolling())
+ return (false);
+
// Monsters in a battle frenzy are likewise occupied.
// But roused holy creatures are not.
if (mons->has_ench(ENCH_BATTLE_FRENZY) && !one_chance_in(3))