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 1087b3fd1b7bc53b86124a8a1d88cdb577cd169f..84df91eefc4751da7be3b4e9dea1724d439f0482 100644 (file)
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -2,15 +2,12 @@
 #define BATTLE_SELECTSPELL_H_
 
 namespace battle {
-       class BattleState;
+       class Battle;
        class SelectAttackType;
 }
-namespace math {
-       template<class>
-       class Vector;
-}
 
 #include "../../app/State.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -18,8 +15,7 @@ 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 &);
@@ -35,13 +31,17 @@ private:
        virtual void OnResize(int width, int height);
 
 private:
-       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);
+       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;
 
 };