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 ab1552595bca018ae5694b593aaf93c56e5f07c7..37328dc89db6e01700a94855ac2aa6c9c95c9091 100644 (file)
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -1,6 +1,12 @@
 #ifndef BATTLE_PERFORMATTACKS_H_
 #define BATTLE_PERFORMATTACKS_H_
 
+namespace battle {
+       class Battle;
+       class BattleState;
+       class TargetSelection;
+}
+
 #include "../../app/State.h"
 
 #include "../NumberAnimation.h"
@@ -9,17 +15,14 @@
 
 #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 &);
@@ -42,12 +45,13 @@ private:
 private:
        void AddNumberAnimations(const TargetSelection &);
 
-       void RenderTitleBar(SDL_Surface *screen, const math::Vector<int> &offset) const;
-       void RenderNumbers(SDL_Surface *screen, const math::Vector<int> &offset) const;
-       void RenderTargetAnimation(SDL_Surface *screen, const math::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;
@@ -55,6 +59,9 @@ private:
        app::Timer<Uint32> targetAnimationTimer;
        std::vector<NumberAnimation> numberAnimation;
        std::vector<math::Vector<int> > numberPosition;
+       math::Vector<int> framePosition;
+       math::Vector<int> frameSize;
+       math::Vector<int> textPosition;
        int cursor;
 
 };