extracted battle logic into a class

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

diff --git a/src/battle/states/SelectItem.h b/src/battle/states/SelectItem.h
index 6562b694edb6ca74e0c069400a9fcda731c7754b..f8a6881c9deeb49e9c9b6b877d894cd53790ff68 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -1,23 +1,13 @@
-/*
- * SelectItem.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTITEM_H_
 #define BATTLE_SELECTITEM_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 {
 
@@ -25,8 +15,7 @@ class SelectItem
 : public app::State {
 
 public:
-       SelectItem(BattleState *battle, SelectAttackType *parent)
-       : battle(battle), parent(parent) { }
+       SelectItem(Battle *battle, SelectAttackType *parent);
 
 public:
        virtual void HandleEvents(const app::Input &);
@@ -42,16 +31,20 @@ 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;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTITEM_H_ */
+#endif