void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::MAGIC);
- battle->ActiveHero().GetAttackChoice().SetSpell(battle->GetSpellMenu().Selected());
+ battle->ActiveHero().GetAttackChoice().SetSpell(battle->ActiveHero().SpellMenu().Selected());
ctrl.PopState();
}
}
void SelectSpell::HandleEvents(const Input &input) {
if (input.JustPressed(Input::ACTION_A)) {
- if (battle->GetSpellMenu().SelectedIsEnabled()) {
+ if (battle->ActiveHero().SpellMenu().SelectedIsEnabled()) {
AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
- const Spell *spell(battle->GetSpellMenu().Selected());
+ const Spell *spell(battle->ActiveHero().SpellMenu().Selected());
ac.Selection().Reset();
if (spell->GetTargetingMode().TargetsAlly()) {
ac.Selection().SelectHeroes();
ctrl->PopState(); // return control to parent
}
if (input.JustPressed(Input::PAD_UP)) {
- battle->GetSpellMenu().PreviousRow();
+ battle->ActiveHero().SpellMenu().PreviousRow();
}
if (input.JustPressed(Input::PAD_RIGHT)) {
- battle->GetSpellMenu().NextItem();
+ battle->ActiveHero().SpellMenu().NextItem();
}
if (input.JustPressed(Input::PAD_DOWN)) {
- battle->GetSpellMenu().NextRow();
+ battle->ActiveHero().SpellMenu().NextRow();
}
if (input.JustPressed(Input::PAD_LEFT)) {
- battle->GetSpellMenu().PreviousItem();
+ battle->ActiveHero().SpellMenu().PreviousItem();
}
}
Point<int> position(
2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
- battle->GetSpellMenu().Draw(screen, position + offset);
+ battle->ActiveHero().SpellMenu().Draw(screen, position + offset);
}
}