X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=06ce1b89cd93329719988b561b272fcf1c6982e9;hb=f552d26f537af9fa48255bd71cdc1a0a1b860bac;hp=d060d5a55f38406ed6f0fa11e721fba8569447ad;hpb=9cfff98ffce0529c685fbd5aa52e213c295449a1;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index d060d5a..06ce1b8 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -24,20 +24,21 @@ class PerformAttacks
 
 public:
 	explicit PerformAttacks(BattleState *battle)
-	: ctrl(0), battle(battle), moveAnimation(0), targetAnimation(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 Render(SDL_Surface *);
 
+private:
+	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;
@@ -51,7 +52,6 @@ private:
 	void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
 	graphics::AnimationRunner moveAnimation;
 	graphics::AnimationRunner targetAnimation;
@@ -59,7 +59,7 @@ private:
 	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;
 
 };