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

Create (and delete) defender_stats_ alongside attacker_stats_ (bug #21277)

Browse source
This commit is contained in:
Alexander van Gessel 2013-12-12 14:28:26 +01:00
parent b2b43a02cf
commit d12a0f706e
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/actions/attack.cpp
View file

@ -483,7 +483,15 @@ int battle_context::choose_attacker_weapon(const unit &attacker,
attacker_loc, defender_loc, prev_def);
attacker_stats_ = new battle_context_unit_stats(attacker, attacker_loc, choices[0],
true, defender, defender_loc, &defender.attacks()[*defender_weapon], units);
return attacker_stats_->disable ? -1 : choices[0];
if (attacker_stats_->disable) {
delete attacker_stats_;
attacker_stats_ = NULL;
return -1;
}
const attack_type &att = attacker.attacks()[choices[0]];
defender_stats_ = new battle_context_unit_stats(defender, defender_loc, *defender_weapon, false,
attacker, attacker_loc, &att, units);
return choices[0];
}
// Multiple options: simulate them, save best.