X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=fa16b4c37a7a1e1a1427c4eec35ed8fa2388e3f5;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=a4d58dcc64f47ada4dd39f3a6bd0c53c67108cf0;hpb=8456b7dac2051bfd2b507a39854c1428eb4d91cd;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index a4d58dc..fa16b4c 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -13,54 +13,53 @@
 #include "../BattleState.h"
 #include "../NumberAnimation.h"
 #include "../../geometry/Vector.h"
-#include "../../graphics/ComplexAnimation.h"
+#include "../../graphics/Animation.h"
 
 #include <vector>
 
 namespace battle {
 
-class AttackAnimation;
-
 class PerformAttacks
 : public app::State {
 
 public:
 	explicit PerformAttacks(BattleState *battle)
-	: ctrl(0), battle(battle), moveAnimation(0), attackAnimation(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);
-	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 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 Resize(int width, int height);
+	virtual void OnResize(int width, int height);
 
 	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	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;
-	AttackAnimation *attackAnimation;
+	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;
 
 };