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

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index f6157e1..44ea74b 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -10,24 +10,27 @@
 
 #include "../../app/State.h"
 
+#include "../BattleState.h"
+#include "../NumberAnimation.h"
 #include "../../geometry/Vector.h"
+#include "../../graphics/Animation.h"
 
-namespace battle {
+#include <vector>
 
-class BattleState;
+namespace battle {
 
 class PerformAttacks
 : public app::State {
 
 public:
 	explicit PerformAttacks(BattleState *battle)
-	: ctrl(0), battle(battle), titleBarText(0), cursor(0), monsters(false) { }
+	: 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);
 
@@ -36,15 +39,28 @@ public:
 	virtual void Render(SDL_Surface *);
 
 private:
-	void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void CheckAnimations();
+	bool HasAnimationsRunning() const;
+	void ResetAnimation();
+
+private:
+	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::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<geometry::Vector<int> > numberPosition;
 	int cursor;
-	bool monsters;
 
 };