summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/it_use3.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-08 18:17:24 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-08 18:17:24 +0000
commitc2f198269d696051a6623e690aec147e7364c0af (patch)
tree4bc48b6a0c6f793ee0f50ce91c286532b73d05bc /crawl-ref/source/it_use3.cc
parent6dd738e46a71bedfd960d2e889a39d36baa1d04a (diff)
downloadcrawl-ref-c2f198269d696051a6623e690aec147e7364c0af.tar.gz
crawl-ref-c2f198269d696051a6623e690aec147e7364c0af.zip
Add alternative messages for efreet speech when silenced. (BR 2238678)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7421 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
-rw-r--r--crawl-ref/source/it_use3.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index c6b88c91fc..6405cf33a3 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -714,8 +714,16 @@ static bool efreet_flask(void)
if (player_angers_monster(&menv[monster]))
friendly = false;
- mpr(friendly ? "\"Thank you for releasing me!\""
- : "It howls insanely!");
+ if (silenced(you.pos()))
+ {
+ mpr(friendly ? "It nods graciously at you."
+ : "It snaps in your direction!", MSGCH_TALK_VISUAL);
+ }
+ else
+ {
+ mpr(friendly ? "\"Thank you for releasing me!\""
+ : "It howls insanely!", MSGCH_TALK);
+ }
}
else
canned_msg(MSG_NOTHING_HAPPENS);