From 7d9ef49e6095e668212f98df2119902aae7401d0 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Tue, 1 Jul 2008 03:25:04 +0000 Subject: Bug 2006092: beam.fr_count and beam.foe_count were being unecessarily incremented, leading to stop_attack_prompt() not always being called when it should be. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6276 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 8c97298631..983651bd42 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4352,18 +4352,6 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item) } } - // Enchant case -- enchantments always hit, so update target immed. - if (!mons_atts_aligned(beam.attitude, mons_attitude(mon))) - { - beam.foe_count += 1; - beam.foe_power += mons_power(mons_type); - } - else - { - beam.fr_count += 1; - beam.fr_power += mons_power(mons_type); - } - return (_range_used_on_hit(beam)); } @@ -4532,13 +4520,11 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item) if (!mons_atts_aligned(beam.attitude, mons_attitude(mon))) { // Counting foes is only important for monster tracers. - beam.foe_count += 1; beam.foe_power += 2 * hurt_final * mons_power(mons_type) / hurt; } else { - beam.fr_count += 1; beam.fr_power += 2 * hurt_final * mons_power(mons_type) / hurt; } -- cgit v1.2.3-54-g00ecf