cached some of the battle coordinates

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

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index 3b101881ff5d22e123438569e409b9252d53f5c5..8794a48c2f45cbbcbc945bd32aec188ba6b0c16b 100644 (file)
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.h
@@ -1,47 +1,43 @@
-/*
- * SelectAttackType.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTATTACKTYPE_H_
 #define BATTLE_SELECTATTACKTYPE_H_
 
+namespace battle {
+       class BattleState;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
-class AttackTypeMenu;
-class BattleState;
-
 class SelectAttackType
 : public app::State {
 
 public:
        explicit SelectAttackType(BattleState *battle)
-       : ctrl(0), battle(battle) { }
-       ~SelectAttackType() { }
+       : battle(battle) { }
 
 public:
-       virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ExitState();
+       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 RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderMenu(SDL_Surface *screen);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
+       math::Vector<int> menuOffset;
 
 };
 
 }
-#endif /* BATTLE_SELECTATTACKTYPE_H_ */
+#endif