0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

partly revert cleanup to fix merging conflict

Browse source
This commit is contained in:
gfgtdf 2018-10-16 11:02:14 +02:00
parent 663da0e053
commit bc9953f0f2
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/actions/attack.cpp
View file

@ -715,21 +715,22 @@ int battle_context::choose_defender_weapon(const unit& attacker,
for(i = 0; i < choices.size(); ++i) {
const attack_type& def = defender.attacks()[choices[i]];
auto att_stats = std::make_unique<battle_context_unit_stats>(
attacker, attacker_loc, attacker_weapon, true, defender, defender_loc, def.shared_from_this(), units);
std::unique_ptr<battle_context_unit_stats> att_stats(new battle_context_unit_stats(
attacker, attacker_loc, attacker_weapon, true, defender, defender_loc, def.shared_from_this(), units));
auto def_stats = std::make_unique<battle_context_unit_stats>(
defender, defender_loc, choices[i], false, attacker, attacker_loc, att.shared_from_this(), units);
std::unique_ptr<battle_context_unit_stats> def_stats(new battle_context_unit_stats(
defender, defender_loc, choices[i], false, attacker, attacker_loc, att.shared_from_this(), units));
if(def_stats->disable) {
continue;
}
auto att_comb = std::make_unique<combatant>(*att_stats);
auto def_comb = std::make_unique<combatant>(*def_stats, prev_def);
std::unique_ptr<combatant> att_comb(new combatant(*att_stats));
std::unique_ptr<combatant> def_comb(new combatant(*def_stats, prev_def));
att_comb->fight(*def_comb);
int simple_rating = static_cast<int>(
def_stats->num_blows * def_stats->damage * def_stats->chance_to_hit * def.defense_weight());