diff options
author | Matthew Cline <zelgadis@sourceforge.net> | 2009-10-21 13:21:20 -0700 |
---|---|---|
committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-10-21 13:21:20 -0700 |
commit | c7a7fb4439a5f5006109abcd20cd0300f7d36827 (patch) | |
tree | 9a92c9a28570abc6488d58a032048e5f8b12c137 /crawl-ref/source/fight.cc | |
parent | 1995a2a6436f8a2d3216634f24d5ed76d97327e2 (diff) | |
download | crawl-ref-c7a7fb4439a5f5006109abcd20cd0300f7d36827.tar.gz crawl-ref-c7a7fb4439a5f5006109abcd20cd0300f7d36827.zip |
Don't disturb monsters witth their own sound
A monster making noise was causing an ME_DISTURB behaviour_event() for
itself, possibly causing it to get a new foe, which could cause strange
results if it switched foes during the middle of spell-casting when it
made noise from chanting. Now noisy() can accept a "who" parameter, in
which case the monster which caused the noise will ignore the noise.
This is done in all cases except for when a monster of animal or lower
intelligence sets off an alarm trap or does a spell miscast.
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r-- | crawl-ref/source/fight.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index e1e8d6b339..7366b7c29b 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2647,7 +2647,7 @@ void melee_attack::chaos_affects_attacker() if (!msg.empty()) { mpr(msg.c_str(), MSGCH_SOUND); - noisy(15, attacker->pos()); + noisy(15, attacker->pos(), attacker->mindex()); #ifdef NOTE_DEBUG_CHAOS_EFFECTS take_note(Note(NOTE_MESSAGE, 0, 0, "CHAOS affects attacker: noise"), true); |