upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 10:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug in choosing which weapon to respond to an attack with

Browse Source
This commit is contained in:
Dave White 2004-12-17 12:45:43 +00:00
parent 86317decc9
commit 5dbafe377b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/actions.cpp
View File

@ -270,7 +270,7 @@ battle_stats evaluate_battle_stats(const gamemap& map,
//don't show backstabbing unless it's actually happening //don't show backstabbing unless it's actually happening
if(attack.special() == backstab_string && !backstab) 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")); 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() && if(defender_attacks[defend_option].range() == attack.range() &&
defender_attacks[defend_option].hexes() >= combat_range) { defender_attacks[defend_option].hexes() >= combat_range) {
const double rating = a->second.damage_against(defender_attacks[defend_option]) 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].num_attacks()
*defender_attacks[defend_option].defense_weight(); *defender_attacks[defend_option].defense_weight();
if(defend_with == -1 || rating > best_defend_rating) { if(defend_with == -1 || rating > best_defend_rating) {