diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 20:15:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 20:15:03 +0000 |
| commit | 8cbb227becdc172839b901aedf972022dc73118d (patch) | |
| tree | 0bd26e8356d53ebe455ae21bdc391e7adb79beb9 /crawl-ref/source/fight.cc | |
| parent | 504342b26a04cf2e33cb49b61d721ee483f5c68b (diff) | |
| download | crawl-ref-8cbb227becdc172839b901aedf972022dc73118d.tar.gz crawl-ref-8cbb227becdc172839b901aedf972022dc73118d.zip | |
Apply a bunch of trunk commits, mostly by Haran, namely:
6766 (partly), 6834 (partly), 6867, 6892, 6903, 6906, 6908, 6909,
6927, 6928, 6929, 6943, 6945, 6946
* Message/description tweaks.
* Fix enchanting hides not updating AC.
* Fix incorrect score calculation.
* All 't' commands now take a turn.
* Don't prompt when swapping into dangerous terrain.
* Fix backwards stealth check.
* Fix off-by-1 error when selecting starting weapon.
* Lichform discards holy wrath weapons.
* Reinitialise zap counter for recharged wands, mention charges.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7786 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 676c72386a..dd585a1410 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1167,6 +1167,9 @@ bool melee_attack::player_aux_unarmed() if (!ely_block && (to_hit >= def->ev || one_chance_in(30))) { + // Upset the monster. + behaviour_event(def, ME_WHACK, MHITYOU); + if (attack_shield_blocked(true)) continue; if (player_apply_aux_unarmed()) @@ -1536,7 +1539,7 @@ int melee_attack::player_stab(int damage) if (stab_bonus) { - // Lets make sure we have some damage to work with... + // Let's make sure we have some damage to work with... damage = std::max(1, damage); if (mons_is_sleeping(def)) |