extracted battle logic into a class

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

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 68e736001db6d85ae6719306ab1b5a7c35c6ff87..d1b4d923e48c4723c57ecf0348c3ae53c5178d10 100644 (file)
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -1,16 +1,15 @@
-/*
- * SwapHeroes.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SWAPHEROES_H_
 #define BATTLE_SWAPHEROES_H_
 
-#include "../fwd.h"
+namespace battle {
+       class Battle;
+       class SelectMoveAction;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
+
+#include <vector>
 
 namespace battle {
 
@@ -18,21 +17,21 @@ class SwapHeroes
 : public app::State {
 
 public:
-       SwapHeroes(BattleState *battle, SelectMoveAction *parent)
-       : ctrl(0), battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
+       SwapHeroes(Battle *battle, SelectMoveAction *parent);
 
 public:
-       virtual void OnEnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
-
-       virtual void OnResize(int width, int height);
-
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
+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 OnResize(int width, int height);
+
 private:
        void MoveUp();
        void MoveRight();
@@ -40,12 +39,14 @@ private:
        void MoveLeft();
 
 private:
-       void RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderCursors(SDL_Surface *screen);
 
 private:
-       app::Application *ctrl;
-       BattleState *battle;
+       Battle *battle;
        SelectMoveAction *parent;
+       std::vector<math::Vector<int> > positions;
+       math::Vector<int> cursorOffset;
+       math::Vector<int> indicatorOffset;
        int cursor;
        int selected;
        bool flipFlop;
@@ -54,4 +55,4 @@ private:
 
 }
 
-#endif /* BATTLE_SWAPHEROES_H_ */
+#endif