From b88c1e081c6245d8b00db69270482a5034964dcd Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 24 Aug 2009 15:03:48 +0000 Subject: Apply trunk r10599 to 0.5. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10600 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 7bce7d2313..9a274c4c9b 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1238,8 +1238,8 @@ bool melee_attack::player_aux_unarmed() } // unified to-hit calculation - to_hit = random2( calc_your_to_hit_unarmed(uattack, - damage_brand == SPWPN_VAMPIRICISM) ); + to_hit = random2(calc_your_to_hit_unarmed(uattack, + damage_brand == SPWPN_VAMPIRICISM)); make_hungry(2, true); @@ -2000,9 +2000,16 @@ bool melee_attack::player_monattk_hit_effects(bool mondied) special_damage); #endif - special_damage = defender->hurt(&you, special_damage); + special_damage = defender->hurt(&you, special_damage, BEAM_MISSILE, false); - return (!defender->alive()); + if (!defender->alive()) + { + _monster_die(defender_as_monster(), KILL_YOU, NON_MONSTER); + + return (true); + } + + return (false); } void melee_attack::_monster_die(monsters* monster, killer_type killer, -- cgit v1.2.3-54-g00ecf