extracted battle logic into a class

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

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index b8623698f5734715b3818c0fe6d375fa9a1b437c..37328dc89db6e01700a94855ac2aa6c9c95c9091 100644 (file)
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -1,36 +1,32 @@
-/*
- * PerformAttacks.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_PERFORMATTACKS_H_
 #define BATTLE_PERFORMATTACKS_H_
 
+namespace battle {
+       class Battle;
+       class BattleState;
+       class TargetSelection;
+}
+
 #include "../../app/State.h"
 
 #include "../NumberAnimation.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 #include "../../graphics/Animation.h"
 
 #include <vector>
 
-namespace battle {
 
-class BattleState;
-class TargetSelection;
+namespace battle {
 
 class PerformAttacks
 : public app::State {
 
 public:
-       explicit PerformAttacks(BattleState *battle)
-       : battle(battle), moveAnimation(0), targetAnimation(0), titleBarText(0), cursor(-1) { }
+       PerformAttacks(Battle *battle, BattleState *parent);
 
 public:
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
 private:
@@ -49,23 +45,27 @@ private:
 private:
        void AddNumberAnimations(const TargetSelection &);
 
-       void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderNumbers(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+       void RenderTitleBar(SDL_Surface *screen) const;
+       void RenderNumbers(SDL_Surface *screen) const;
+       void RenderTargetAnimation(SDL_Surface *screen) const;
 
 private:
-       BattleState *battle;
+       Battle *battle;
+       BattleState *parent;
        graphics::AnimationRunner moveAnimation;
        graphics::AnimationRunner targetAnimation;
        const char *titleBarText;
        app::Timer<Uint32> titleBarTimer;
        app::Timer<Uint32> targetAnimationTimer;
        std::vector<NumberAnimation> numberAnimation;
-       std::vector<geometry::Vector<int> > numberPosition;
+       std::vector<math::Vector<int> > numberPosition;
+       math::Vector<int> framePosition;
+       math::Vector<int> frameSize;
+       math::Vector<int> textPosition;
        int cursor;
 
 };
 
 }
 
-#endif /* BATTLE_PERFORMATTACKS_H_ */
+#endif