store an application handle in each state

[l2e.git] / src / battle / states / SelectItem.h

diff --git a/src/battle/states/SelectItem.h b/src/battle/states/SelectItem.h
index be089f83df381eb7ad3a85132567d37057e2b382..52429aa5c9d9d15bad4f319d183c44eddedff179 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -8,41 +8,38 @@
 #ifndef BATTLE_SELECTITEM_H_
 #define BATTLE_SELECTITEM_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 class SelectItem
 : public app::State {
 
 public:
        SelectItem(BattleState *battle, SelectAttackType *parent)
-       : ctrl(0), battle(battle), parent(parent) { }
+       : battle(battle), parent(parent) { }
 
 public:
-       virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-       virtual void Resize(int width, int height);
-
-       virtual void HandleInput(const app::Input &);
+       virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
+private:
+       virtual void OnEnterState(app::Application &ctrl, SDL_Surface *screen);
+       virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
+       virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
+       virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
+
+       virtual void OnResize(int width, int height);
+
 private:
        void RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
        void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);
        void RenderMenu(SDL_Surface *, const geometry::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        SelectAttackType *parent;