From 5dbafe377b22a66c7d09ceffb1e718e187f6349f Mon Sep 17 00:00:00 2001 From: Dave White Date: Fri, 17 Dec 2004 12:45:43 +0000 Subject: [PATCH] fixed bug in choosing which weapon to respond to an attack with --- src/actions.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/actions.cpp b/src/actions.cpp index 4948aef5257..da7e884a8ae 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -270,7 +270,7 @@ battle_stats evaluate_battle_stats(const gamemap& map, //don't show backstabbing unless it's actually happening if(attack.special() == backstab_string && !backstab) - strings->attack_special.clear(); + strings->attack_special = ""; strings->range = gettext(attack.range() == attack_type::SHORT_RANGE ? N_("melee") : N_("ranged")); } @@ -283,6 +283,7 @@ battle_stats evaluate_battle_stats(const gamemap& map, if(defender_attacks[defend_option].range() == attack.range() && defender_attacks[defend_option].hexes() >= combat_range) { const double rating = a->second.damage_against(defender_attacks[defend_option]) + *defender_attacks[defend_option].damage() *defender_attacks[defend_option].num_attacks() *defender_attacks[defend_option].defense_weight(); if(defend_with == -1 || rating > best_defend_rating) {