wrapped some virtual State methods in non-virtual calls

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

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index 870f48d5abf5c744b794b1532b723b838f5732e4..0f2818df8f60ede3d291cd6ed9e1069c35e99a40 100644 (file)
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -8,14 +8,12 @@
 #ifndef BATTLE_RUNSTATE_H_
 #define BATTLE_RUNSTATE_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-
 class RunState
 : public app::State {
 
@@ -24,17 +22,22 @@ 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 RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+
 private:
        app::Application *ctrl;
        BattleState *battle;