X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=e52160c077c930848a958d8db82401a05ea82df2;hb=7252571fb926a187c4c40e8f4eec718f16d63ffa;hp=e8a878d761e6b214820ba998407c7d98087dc617;hpb=a01c2f05b5a6493d7fe097eb15e5337a095992ae;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index e8a878d..e52160c 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>
 
@@ -27,23 +27,26 @@ public:
 	: 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 Resize(int width, int height);
-
 	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
+private:
+	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 OnResize(int width, int height);
+
 private:
 	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;
@@ -51,13 +54,13 @@ private:
 private:
 	app::Application *ctrl;
 	BattleState *battle;
-	graphics::Animation *moveAnimation;
-	graphics::Animation *targetAnimation;
+	graphics::AnimationRunner moveAnimation;
+	graphics::AnimationRunner targetAnimation;
 	const char *titleBarText;
 	app::Timer<Uint32> titleBarTimer;
 	app::Timer<Uint32> targetAnimationTimer;
 	std::vector<NumberAnimation> numberAnimation;
-	std::vector<geometry::Point<int> > numberPosition;
+	std::vector<geometry::Vector<int> > numberPosition;
 	int cursor;
 
 };