extracted battle logic into a class

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

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index 514a2b8a6b55175ad1ce5e596b4d9e458190ac00..84df91eefc4751da7be3b4e9dea1724d439f0482 100644 (file)
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -1,16 +1,13 @@
-/*
- * SelectSpell.h
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTSPELL_H_
 #define BATTLE_SELECTSPELL_H_
 
-#include "../fwd.h"
+namespace battle {
+       class Battle;
+       class SelectAttackType;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -18,12 +15,11 @@ class SelectSpell
 : public app::State {
 
 public:
-       SelectSpell(BattleState *battle, SelectAttackType *parent)
-       : battle(battle), parent(parent) { }
+       SelectSpell(Battle *battle, SelectAttackType *parent);
 
 public:
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
 private:
@@ -35,16 +31,20 @@ private:
        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 *);
+       void RenderHeadline(SDL_Surface *);
+       void RenderMenu(SDL_Surface *);
 
 private:
-       BattleState *battle;
+       Battle *battle;
        SelectAttackType *parent;
+       math::Vector<int> framePosition;
+       math::Vector<int> frameSize;
+       math::Vector<int> headlinePosition;
+       math::Vector<int> menuPosition;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTSPELL_H_ */
+#endif