X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=ab1552595bca018ae5694b593aaf93c56e5f07c7;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=2fe9a06b9c5d31367d08d32489152a21a07b4747;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h index 2fe9a06..ab15525 100644 --- a/src/battle/states/PerformAttacks.h +++ b/src/battle/states/PerformAttacks.h @@ -1,24 +1,19 @@ -/* - * PerformAttacks.h - * - * Created on: Aug 10, 2012 - * Author: holy - */ - #ifndef BATTLE_PERFORMATTACKS_H_ #define BATTLE_PERFORMATTACKS_H_ #include "../../app/State.h" -#include "../BattleState.h" #include "../NumberAnimation.h" -#include "../../geometry/Vector.h" +#include "../../math/Vector.h" #include "../../graphics/Animation.h" #include namespace battle { +class BattleState; +class TargetSelection; + class PerformAttacks : public app::State { @@ -28,14 +23,14 @@ public: public: virtual void HandleEvents(const app::Input &); - virtual void UpdateWorld(float deltaT); + virtual void UpdateWorld(Uint32 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 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); @@ -47,9 +42,9 @@ private: private: void AddNumberAnimations(const TargetSelection &); - void RenderTitleBar(SDL_Surface *screen, const geometry::Vector &offset) const; - void RenderNumbers(SDL_Surface *screen, const geometry::Vector &offset) const; - void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector &offset) const; + void RenderTitleBar(SDL_Surface *screen, const math::Vector &offset) const; + void RenderNumbers(SDL_Surface *screen, const math::Vector &offset) const; + void RenderTargetAnimation(SDL_Surface *screen, const math::Vector &offset) const; private: BattleState *battle; @@ -59,11 +54,11 @@ private: app::Timer titleBarTimer; app::Timer targetAnimationTimer; std::vector numberAnimation; - std::vector > numberPosition; + std::vector > numberPosition; int cursor; }; } -#endif /* BATTLE_PERFORMATTACKS_H_ */ +#endif