From 928664955e143425ca68963676c25ff2d63d90e5 Mon Sep 17 00:00:00 2001 From: Robert Burnham Date: Wed, 16 Mar 2011 15:59:39 -0500 Subject: [PATCH] Code cleanup Cleanup some actor -> monster casting that was being done in spiny unnecessarily. --- crawl-ref/source/fight.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 865219f25..d9b31335b 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -5345,9 +5345,7 @@ void melee_attack::mons_do_spines() if (body) evp = -property(*body, PARM_EVASION); - if (you.mutation[MUT_SPINY] - && attacker->alive() - && one_chance_in(evp + 1)) + if (you.mutation[MUT_SPINY] && attacker->alive() && one_chance_in(evp + 1)) { if (test_melee_hit(2 + 4 * mut, attacker->melee_evasion(defender), r) < 0) @@ -5358,8 +5356,7 @@ void melee_attack::mons_do_spines() } int dmg = roll_dice(mut, 6); - int ac = random2(1+attacker->as_monster()->armour_class()); - + int ac = random2(1 + attacker->armour_class()); int hurt = dmg - ac - evp; dprf("Spiny: dmg = %d ac = %d hurt = %d", dmg, ac, hurt); @@ -5373,7 +5370,7 @@ void melee_attack::mons_do_spines() " is struck by your spines."); } - attacker->as_monster()->hurt(&you, hurt); + attacker->hurt(&you, hurt); } } -- 2.11.4.GIT