}
void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
- if (battle->ActiveHeroTargets().HasSelected()) {
- battle->SetAttackType(AttackChoice::MAGIC);
- battle->ActiveHeroAttackChoice().SetSpell(battle->GetSpellMenu().Selected());
+ if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
+ battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::MAGIC);
+ battle->ActiveHero().GetAttackChoice().SetSpell(battle->GetSpellMenu().Selected());
ctrl.PopState();
}
}
void SelectSpell::HandleEvents(const Input &input) {
if (input.JustPressed(Input::ACTION_A)) {
if (battle->GetSpellMenu().SelectedIsEnabled()) {
+ AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
const Spell *spell(battle->GetSpellMenu().Selected());
- battle->ActiveHeroTargets().Reset();
+ ac.Selection().Reset();
if (spell->GetTargetingMode().TargetsAlly()) {
- battle->ActiveHeroTargets().SelectHeroes();
+ ac.Selection().SelectHeroes();
} else {
- battle->ActiveHeroTargets().SelectEnemies();
+ ac.Selection().SelectEnemies();
}
if (spell->GetTargetingMode().TargetsAll()) {
- battle->SetAttackType(AttackChoice::MAGIC);
+ ac.SetType(AttackChoice::MAGIC);
// TODO: remove item from inventory
- battle->ActiveHeroAttackChoice().SetSpell(spell);
+ ac.SetSpell(spell);
battle->NextHero();
ctrl->PopState();
} else {
if (spell->GetTargetingMode().TargetsSingle()) {
- battle->ActiveHeroTargets().SetSingle();
+ ac.Selection().SetSingle();
} else {
- battle->ActiveHeroTargets().SetMultiple();
+ ac.Selection().SetMultiple();
}
- ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().magicTargetCursor));
+ ctrl->PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().magicTargetCursor));
}
}
}
void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
const Frame *frame(battle->Res().selectFrame);
Point<int> position(frame->BorderWidth(), frame->BorderHeight());
- int width(battle->BackgroundWidth() - 2 * frame->BorderWidth());
+ int width(battle->Width() - 2 * frame->BorderWidth());
int height(battle->Res().normalFont->CharHeight() * 13);
frame->Draw(screen, position + offset, width, height);
}