upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 22:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid vector index (bug #21402)

Browse Source
This commit is contained in:
Alexander van Gessel 2014-01-03 01:06:25 +01:00
parent 4a9ca54455
commit 3a2c24d2d0
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/attack.cpp
View File

@ -481,8 +481,9 @@ int battle_context::choose_attacker_weapon(const unit &attacker,
if (choices.size() == 1) {
*defender_weapon = choose_defender_weapon(attacker, defender, choices[0], units,
attacker_loc, defender_loc, prev_def);
const attack_type *def_weapon = *defender_weapon >= 0 ? &defender.attacks()[*defender_weapon] : NULL;
attacker_stats_ = new battle_context_unit_stats(attacker, attacker_loc, choices[0],
true, defender, defender_loc, &defender.attacks()[*defender_weapon], units);
true, defender, defender_loc, def_weapon, units);
if (attacker_stats_->disable) {
delete attacker_stats_;
attacker_stats_ = NULL;