store an application handle in each state

[l2e.git] / src / battle / states / SelectMoveAction.cpp

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index 072b03d229791c55ad9d57d93b736f552b503952..bb7148727d77246e250d362fe323e19d6c639373 100644 (file)
--- 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;
                }
        }