diff options
author | Adam Borowski <kilobyte@angband.pl> | 2010-09-16 01:12:56 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2010-09-16 01:12:56 +0200 |
commit | 1e9506083b324fc9a5a3e7c4470f666fa91cfba4 (patch) | |
tree | 0bb45a71b2830a3a4656cbbb2fc75f6907de4e10 /crawl-ref/source/spl-wpnench.cc | |
parent | 481a0e751b3c7b450e19131da4e9d4aba93b0711 (diff) | |
download | crawl-ref-1e9506083b324fc9a5a3e7c4470f666fa91cfba4.tar.gz crawl-ref-1e9506083b324fc9a5a3e7c4470f666fa91cfba4.zip |
Fix a shriek when Xom casts Excrutiation Wounds while you're silenced.
(Yeah, this is such a common occurence...)
Diffstat (limited to 'crawl-ref/source/spl-wpnench.cc')
-rw-r--r-- | crawl-ref/source/spl-wpnench.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-wpnench.cc b/crawl-ref/source/spl-wpnench.cc index 1b0a227a41..e06231310c 100644 --- a/crawl-ref/source/spl-wpnench.cc +++ b/crawl-ref/source/spl-wpnench.cc @@ -8,6 +8,7 @@ #include "spl-wpnench.h" #include "externs.h" +#include "areas.h" #include "artefact.h" #include "itemprop.h" #include "makeitem.h" @@ -181,8 +182,14 @@ bool brand_weapon(brand_type which_brand, int power) case SPWPN_PAIN: // Well, in theory, we could be silenced, but then how are // we casting the brand spell? - msg += " shrieks in agony."; - noisy(15, you.pos()); + // 1KB: Xom can cast it. The Blade card currently can't. + if (silenced(you.pos())) + msg += " writhes in agony."; + else + { + msg += " shrieks in agony."; + noisy(15, you.pos()); + } duration_affected = 8; // We must repeat the special message here (as there's a side effect.) emit_special_message = true; |