wrapped some virtual State methods in non-virtual calls

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

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index 4f88c4fd3e7db4e5a2498accc91bcde15408ab53..bb04fb51e3a20cc1700236c571179dd76c33c329 100644 (file)
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -8,14 +8,12 @@
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class MoveMenu;
-
 class SelectMoveAction
 : public app::State {
 
@@ -24,17 +22,18 @@ public:
        : ctrl(0), battle(battle) { }
 
 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 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 RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);