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 bf29124e55cc0657851c32cd778968656a36e004..52429aa5c9d9d15bad4f319d183c44eddedff179 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -19,19 +19,20 @@ class SelectItem
 
 public:
        SelectItem(BattleState *battle, SelectAttackType *parent)
-       : ctrl(0), battle(battle), parent(parent) { }
+       : battle(battle), parent(parent) { }
 
 public:
+       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 Resize(int width, int height);
-
-       virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
-       virtual void Render(SDL_Surface *);
+       virtual void OnResize(int width, int height);
 
 private:
        void RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
@@ -39,7 +40,6 @@ private:
        void RenderMenu(SDL_Surface *, const geometry::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        SelectAttackType *parent;