- if (battle->GetSpellMenu().SelectedIsEnabled()) {
- const Spell *spell(battle->GetSpellMenu().Selected());
- battle->ActiveHeroTargets().Reset();
+ if (battle->ActiveHero().SpellMenu().SelectedIsEnabled()) {
+ AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
+ const Spell *spell(battle->ActiveHero().SpellMenu().Selected());
+ ac.Selection().Reset();