X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=2860a81afa7977ec5905b5b1356f63469ac6775a;hb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;hp=87436b0faad8d862a58f82f185013d309a8f4fc9;hpb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;p=l2e.git diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp index 87436b0..2860a81 100644 --- a/src/battle/states/SelectIkari.cpp +++ b/src/battle/states/SelectIkari.cpp @@ -24,28 +24,28 @@ using graphics::Frame; namespace battle { -void SelectIkari::EnterState(Application &c, SDL_Surface *screen) { - ctrl = &c; +void SelectIkari::OnEnterState(SDL_Surface *screen) { + } -void SelectIkari::ExitState(Application &c, SDL_Surface *screen) { - ctrl = 0; +void SelectIkari::OnExitState(SDL_Surface *screen) { + } -void SelectIkari::ResumeState(Application &ctrl, SDL_Surface *screen) { +void SelectIkari::OnResumeState(SDL_Surface *screen) { if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) { battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::IKARI); battle->ActiveHero().GetAttackChoice().SetItem(battle->ActiveHero().IkariMenu().Selected()); - ctrl.PopState(); + Ctrl().PopState(); } } -void SelectIkari::PauseState(Application &ctrl, SDL_Surface *screen) { +void SelectIkari::OnPauseState(SDL_Surface *screen) { } -void SelectIkari::Resize(int width, int height) { +void SelectIkari::OnResize(int width, int height) { } @@ -62,23 +62,22 @@ void SelectIkari::HandleEvents(const Input &input) { ac.Selection().SelectMonsters(); } if (ikari->GetTargetingMode().TargetsAll()) { - ac.SetType(AttackChoice::MAGIC); - // TODO: remove item from inventory + ac.SetType(AttackChoice::IKARI); ac.SetItem(battle->ActiveHero().IkariMenu().Selected()); battle->NextHero(); - ctrl->PopState(); + Ctrl().PopState(); } else { if (ikari->GetTargetingMode().TargetsSingle()) { ac.Selection().SetSingle(); } else { ac.Selection().SetMultiple(); } - ctrl->PushState(new SelectTarget(battle, parent, &ac.Selection(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor)); + Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor)); } } } if (input.JustPressed(Input::ACTION_B)) { - ctrl->PopState(); // return control to parent + Ctrl().PopState(); // return control to parent } if (input.JustPressed(Input::PAD_UP)) { battle->ActiveHero().IkariMenu().PreviousRow(); @@ -119,7 +118,7 @@ void SelectIkari::RenderHeadline(SDL_Surface *screen, const Vector &offset) Vector position( 2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(), 2 * res.selectFrame->BorderHeight()); - res.normalFont->DrawString(res.itemMenuHeadline, screen, position + offset); + res.normalFont->DrawString(res.ikariMenuHeadline, screen, position + offset); } void SelectIkari::RenderMenu(SDL_Surface *screen, const Vector &offset) {