X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=de20f76cbeaa267ccd5f6a08eb96f0a3094f4dce;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=f6157e1bc9d298468f3cfd73ed3950d74c16591e;hpb=222167ba3722dc7f47ff7510006bd516e0010a50;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index f6157e1..de20f76 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -10,41 +10,59 @@
 
 #include "../../app/State.h"
 
-#include "../../geometry/Vector.h"
+#include "../NumberAnimation.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), titleBarText(0), cursor(0), monsters(false) { }
+	: 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 Render(SDL_Surface *);
 
 private:
-	void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	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();
+
+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;
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
+	graphics::AnimationRunner moveAnimation;
+	graphics::AnimationRunner targetAnimation;
 	const char *titleBarText;
-	app::Timer<Uint32> fakeMoveTimer;
+	app::Timer<Uint32> titleBarTimer;
+	app::Timer<Uint32> targetAnimationTimer;
+	std::vector<NumberAnimation> numberAnimation;
+	std::vector<math::Vector<int> > numberPosition;
 	int cursor;
-	bool monsters;
 
 };