- if (battle->GetItemMenu().SelectedIsEnabled()) {
- const Item *item(battle->GetItemMenu().Selected());
- battle->ActiveHeroTargets().Reset();
- if (item->TargetAlly()) {
- battle->ActiveHeroTargets().SelectHeroes();
+ if (battle->ItemMenu().SelectedIsEnabled()) {
+ AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
+ const Item *item(battle->ItemMenu().Selected());
+ ac.Selection().Reset();
+ if (item->GetTargetingMode().TargetsAlly()) {
+ ac.Selection().SelectHeroes();