added advantage turn checking in MapState

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

diff --git a/src/battle/states/SelectItem.h b/src/battle/states/SelectItem.h
index be089f83df381eb7ad3a85132567d37057e2b382..e9a30d8a76347611428775bd9b5d7839ee2e471f 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -1,48 +1,45 @@
-/*
- * SelectItem.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTITEM_H_
 #define BATTLE_SELECTITEM_H_
 
-#include "../../app/State.h"
+namespace battle {
+       class BattleState;
+       class SelectAttackType;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
 
-#include "../../geometry/Vector.h"
+#include "../../app/State.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 HandleEvents(const app::Input &);
+       virtual void UpdateWorld(Uint32 deltaT);
+       virtual void Render(SDL_Surface *);
 
-       virtual void Resize(int width, int height);
+private:
+       virtual void OnEnterState(SDL_Surface *screen);
+       virtual void OnExitState(SDL_Surface *screen);
+       virtual void OnResumeState(SDL_Surface *screen);
+       virtual void OnPauseState(SDL_Surface *screen);
 
-       virtual void HandleInput(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);
-       void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);
-       void RenderMenu(SDL_Surface *, const geometry::Vector<int> &offset);
+       void RenderFrame(SDL_Surface *, const math::Vector<int> &offset);
+       void RenderHeadline(SDL_Surface *, const math::Vector<int> &offset);
+       void RenderMenu(SDL_Surface *, const math::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        SelectAttackType *parent;
 
@@ -50,4 +47,4 @@ private:
 
 }
 
-#endif /* BATTLE_SELECTITEM_H_ */
+#endif