X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=19c6967379b258cafad54e48ac48ee5ecaccbbbe;hb=0542849dfccfec1ce1477265fa0fee2401a8fb23;hp=a5f3247b404a7fd2bf64fd0dd495453c18843d7d;hpb=aedc31b88715246abc00a0ab333bea6e17bbb780;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index a5f3247..19c6967 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -13,7 +13,7 @@
 #include "../BattleState.h"
 #include "../NumberAnimation.h"
 #include "../../geometry/Vector.h"
-#include "../../graphics/ComplexAnimation.h"
+#include "../../graphics/Animation.h"
 
 #include <vector>
 
@@ -24,7 +24,7 @@ class PerformAttacks
 
 public:
 	explicit PerformAttacks(BattleState *battle)
-	: ctrl(0), battle(battle), moveAnimation(0), titleBarText(0), cursor(-1) { }
+	: ctrl(0), battle(battle), moveAnimation(0), targetAnimation(0), titleBarText(0), cursor(-1) { }
 
 public:
 	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
@@ -39,25 +39,27 @@ public:
 	virtual void Render(SDL_Surface *);
 
 private:
-	void CheckNumberAnimation();
+	void CheckAnimations();
 	bool HasAnimationsRunning() const;
 	void ResetAnimation();
-	void AdvanceCursor();
-	bool Finished() const { return cursor >= int(order.size()); }
 
 private:
-	void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderNumbers(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	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;
 
 private:
 	app::Application *ctrl;
 	BattleState *battle;
-	graphics::Animation *moveAnimation;
+	graphics::AnimationRunner moveAnimation;
+	graphics::AnimationRunner targetAnimation;
 	const char *titleBarText;
 	app::Timer<Uint32> titleBarTimer;
-	std::vector<BattleState::Order> order;
+	app::Timer<Uint32> targetAnimationTimer;
 	std::vector<NumberAnimation> numberAnimation;
-	std::vector<geometry::Point<int> > numberPosition;
+	std::vector<geometry::Vector<int> > numberPosition;
 	int cursor;
 
 };