summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-17 22:48:28 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-17 22:48:28 +0000
commit94d956b872a116e4523fc73fec1a0420c33615ee (patch)
tree7ff7cbe53a05b5020f47535d4e36e6139c07338f /crawl-ref/source/fight.cc
parent00c8183d4970b86b8007f69197eb08b9bc0edafc (diff)
downloadcrawl-ref-94d956b872a116e4523fc73fec1a0420c33615ee.tar.gz
crawl-ref-94d956b872a116e4523fc73fec1a0420c33615ee.zip
Implement [2535038]: monsters now have a chance of shouting whenever
they are woken up, unless it's by a successful stab. (The previous behaviour made them shout only when they were woken up by the player walking around.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9121 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 417753447a..66bcf8cc8c 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -865,7 +865,9 @@ bool melee_attack::player_attack()
}
// Always upset monster regardless of damage.
- behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU);
+ // However, successful stabs inhibit shouting.
+ behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU,
+ coord_def(), !stab_attempt);
if (damage_done > 0
&& !defender->is_summoned()