X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=b8623698f5734715b3818c0fe6d375fa9a1b437c;hb=e1edc92c4fb834c8061118e89c0d7e239742b030;hp=e52160c077c930848a958d8db82401a05ea82df2;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h index e52160c..b862369 100644 --- a/src/battle/states/PerformAttacks.h +++ b/src/battle/states/PerformAttacks.h @@ -10,7 +10,6 @@ #include "../../app/State.h" -#include "../BattleState.h" #include "../NumberAnimation.h" #include "../../geometry/Vector.h" #include "../../graphics/Animation.h" @@ -19,12 +18,15 @@ namespace battle { +class BattleState; +class TargetSelection; + class PerformAttacks : public app::State { 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 HandleEvents(const app::Input &); @@ -32,10 +34,10 @@ public: 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 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); @@ -52,7 +54,6 @@ private: void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector &offset) const; private: - app::Application *ctrl; BattleState *battle; graphics::AnimationRunner moveAnimation; graphics::AnimationRunner targetAnimation;