extracted battle logic into a class

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

diff --git a/src/battle/states/SelectTarget.h b/src/battle/states/SelectTarget.h
index 121b8ad235f72638aef1c60698d3255e6921a87b..29035c8352b6d7f975067559da0f5228f97fcc3b 100644 (file)
--- a/src/battle/states/SelectTarget.h
+++ b/src/battle/states/SelectTarget.h
@@ -1,27 +1,19 @@
-/*
- * SelectTarget.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTTARGET_H_
 #define BATTLE_SELECTTARGET_H_
 
 namespace battle {
-       class BattleState;
+       class Battle;
        class SelectAttackType;
        class TargetSelection;
 }
-namespace math {
-       template<class>
-       class Vector;
-}
 namespace graphics {
        class Sprite;
 }
 
 #include "../../app/State.h"
+#include "../../math/Vector.h"
+
+#include <vector>
 
 namespace battle {
 
@@ -29,8 +21,10 @@ class SelectTarget
 : public app::State {
 
 public:
-       SelectTarget(BattleState *battle, SelectAttackType *parent, TargetSelection *selection, const graphics::Sprite *cursorIcon)
-       : battle(battle), parent(parent), selection(selection), cursorIcon(cursorIcon), flipFlop(true) { }
+       SelectTarget(Battle *battle,
+                       SelectAttackType *parent,
+                       TargetSelection *selection,
+                       const graphics::Sprite *cursorIcon);
 
 public:
        virtual void HandleEvents(const app::Input &);
@@ -46,17 +40,21 @@ private:
        virtual void OnResize(int width, int height);
 
 private:
-       void RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset);
+       void RenderCursors(SDL_Surface *screen);
 
 private:
-       BattleState *battle;
+       Battle *battle;
        SelectAttackType *parent;
        TargetSelection *selection;
        const graphics::Sprite *cursorIcon;
+       std::vector<math::Vector<int> > monsterPositions;
+       std::vector<math::Vector<int> > heroPositions;
+       math::Vector<int> cursorOffset;
+       math::Vector<int> indicatorOffset;
        bool flipFlop;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTTARGET_H_ */
+#endif