summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-28 03:56:06 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-28 03:56:06 +0000
commitb9cd7423d2652ba7e0cf40ba34b662bfd695c88e (patch)
tree0dfa171dfeb442f60748e1040453d4b0e4762219 /crawl-ref/source/effects.cc
parent3c8f48b92809b1e94f9762fc903e819cf535512b (diff)
downloadcrawl-ref-b9cd7423d2652ba7e0cf40ba34b662bfd695c88e.tar.gz
crawl-ref-b9cd7423d2652ba7e0cf40ba34b662bfd695c88e.zip
Add more silence checks for random uselessness scroll effects.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5306 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 13ef639748..bed5b8de64 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -753,14 +753,15 @@ void random_uselessness(unsigned char ru, unsigned char sc_read_2)
<< " for a moment." << std::endl;
}
else
- {
canned_msg(MSG_NOTHING_HAPPENS);
- }
break;
case 3:
- msg::stream << "You hear the distant roaring of an enraged "
- << weird_roaring_animal() << "!" << std::endl;
+ if (!silenced(you.x_pos, you.y_pos))
+ {
+ msg::stream << "You hear the distant roaring of an enraged "
+ << weird_roaring_animal() << "!" << std::endl;
+ }
break;
case 4:
@@ -781,7 +782,8 @@ void random_uselessness(unsigned char ru, unsigned char sc_read_2)
break;
case 7:
- mpr("You hear the tinkle of a tiny bell.");
+ if (!silenced(you.x_pos, you.y_pos))
+ mpr("You hear the tinkle of a tiny bell.");
cast_summon_butterflies( 100 );
break;