summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-02 00:38:29 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-02 00:38:29 +0000
commitd819e9905456e4200fc00c1ef2481059c1548496 (patch)
tree859f1fb2861f0040d9e37552ba3f4181dd29495b
parent3c0a534b1b61101fcb2161bba1c03546933e8c1b (diff)
downloadcrawl-ref-d819e9905456e4200fc00c1ef2481059c1548496.tar.gz
crawl-ref-d819e9905456e4200fc00c1ef2481059c1548496.zip
Revert spell casting sound system to 0.4 behaviour, since the new sound
system is incomplete. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9881 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/mstuff2.cc4
-rw-r--r--crawl-ref/source/spl-cast.cc5
2 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 56acbc2177..5cf2a940b6 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -536,7 +536,9 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast,
void mons_cast_noise(monsters *monster, bolt &pbolt, spell_type spell_cast)
{
- bool force_silent = false;
+ // XXX: Revert to the 0.4 behaviour of monster spells not making any
+ // noise, since the new sound system is incomplete.
+ bool force_silent = true;
spell_type real_spell = spell_cast;
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 37d8e99a2b..ed12f894e2 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1214,9 +1214,14 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
const bool normal_cast = crawl_state.prev_cmd == CMD_CAST_SPELL
&& god == GOD_NO_GOD;
+ // XXX: Revert to the 0.4 behaviour of spells not making any
+ // noise, since the new sound system is incomplete.
+
+#if 0
// Make some noise if it's actually the player casting.
if (god == GOD_NO_GOD)
noisy( spell_noise(spell), you.pos() );
+#endif
if (allow_fail)
{