X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=adbf3ba8f7e84b80399dd3b5ad4a7e34bd7c9d04;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=a5f3247b404a7fd2bf64fd0dd495453c18843d7d;hpb=aedc31b88715246abc00a0ab333bea6e17bbb780;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index a5f3247..adbf3ba 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -10,54 +10,58 @@
 
 #include "../../app/State.h"
 
-#include "../BattleState.h"
 #include "../NumberAnimation.h"
-#include "../../geometry/Vector.h"
-#include "../../graphics/ComplexAnimation.h"
+#include "../../math/Vector.h"
+#include "../../graphics/Animation.h"
 
 #include <vector>
 
 namespace battle {
 
+class BattleState;
+class TargetSelection;
+
 class PerformAttacks
 : public app::State {
 
 public:
 	explicit PerformAttacks(BattleState *battle)
-	: ctrl(0), battle(battle), moveAnimation(0), titleBarText(0), cursor(-1) { }
+	: battle(battle), moveAnimation(0), targetAnimation(0), titleBarText(0), cursor(-1) { }
 
 public:
-	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-	virtual void Resize(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:
-	void CheckNumberAnimation();
+	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 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 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;
 
 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<math::Vector<int> > numberPosition;
 	int cursor;
 
 };