X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.cpp;h=bb7148727d77246e250d362fe323e19d6c639373;hb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;hp=072b03d229791c55ad9d57d93b736f552b503952;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp index 072b03d..bb71487 100644 --- a/src/battle/states/SelectMoveAction.cpp +++ b/src/battle/states/SelectMoveAction.cpp @@ -22,11 +22,11 @@ using geometry::Vector; namespace battle { void SelectMoveAction::OnEnterState(Application &c, SDL_Surface *screen) { - ctrl = &c; + } void SelectMoveAction::OnExitState(Application &c, SDL_Surface *screen) { - ctrl = 0; + } void SelectMoveAction::OnResumeState(Application &ctrl, SDL_Surface *screen) { @@ -55,14 +55,14 @@ void SelectMoveAction::HandleEvents(const Input &input) { if (input.JustPressed(Input::ACTION_A)) { switch (battle->GetMoveMenu().Selected()) { case MoveMenu::ATTACK: - ctrl->ChangeState(new SelectAttackType(battle)); + Ctrl().ChangeState(new SelectAttackType(battle)); battle->NextHero(); break; case MoveMenu::CHANGE: - ctrl->PushState(new SwapHeroes(battle, this)); + Ctrl().PushState(new SwapHeroes(battle, this)); break; case MoveMenu::RUN: - ctrl->ChangeState(new RunState(battle)); + Ctrl().ChangeState(new RunState(battle)); break; } }