extracted battle logic into a class

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

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index 2a55a92f7f3e512a4e066e57d23b95423098c3d9..156eec16cbec2e22b5ff3647debda3165bfb733d 100644 (file)
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -1,16 +1,15 @@
-/*
- * SelectMoveAction.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
-#include "../fwd.h"
+namespace battle {
+       class Battle;
+       class BattleState;
+       class HeroTag;
+       struct Resources;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -18,30 +17,37 @@ class SelectMoveAction
 : public app::State {
 
 public:
-       explicit SelectMoveAction(BattleState *battle)
-       : ctrl(0), battle(battle) { }
+       SelectMoveAction(Battle *battle, BattleState *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 *);
 
+public:
+       const Resources &Res() const;
+       const math::Vector<int> &ScreenOffset() const;
+       const HeroTag &HeroTagAt(int index) const;
+       const math::Vector<int> &HeroTagPositionAt(int index) const;
+
+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 RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderMenu(SDL_Surface *screen);
 
 private:
-       app::Application *ctrl;
-       BattleState *battle;
+       Battle *battle;
+       BattleState *parent;
+       math::Vector<int> position;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTMOVEACTION_H_ */
+#endif