- if (choice->GetType() != AttackChoice::UNDECIDED) {
- Vector<int> attackIconOffset(labelX + res->heroTagLabels->Width(), frameOffset.Y() + 3 * res->heroTagFont->CharHeight());
- res->attackChoiceIcons->Draw(screen, position + attackIconOffset, 0, choice->GetType());
+ if (battle->AttackChoiceAt(index).GetType() != AttackChoice::UNDECIDED) {
+ Vector<int> attackIconOffset(labelX + r.heroTagLabels->Width(), frameOffset.Y() + 3 * r.heroTagFont->CharHeight());
+ r.attackChoiceIcons->Draw(screen, position + attackIconOffset, 0, battle->AttackChoiceAt(index).GetType());