X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=0f51f237cd2a47138ac222127f269a15f477aca8;hb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;hp=00cea78781cf14166dc779408c344475b0371cd2;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 00cea78..0f51f23 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -1,10 +1,3 @@ -/* - * BattleState.h - * - * Created on: Aug 5, 2012 - * Author: holy - */ - #ifndef BATTLE_BATTLESTATE_H_ #define BATTLE_BATTLESTATE_H_ @@ -56,13 +49,6 @@ public: void AddHero(const Hero &); public: - 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); - virtual void HandleEvents(const app::Input &); virtual void UpdateWorld(float deltaT); virtual void Render(SDL_Surface *); @@ -137,6 +123,14 @@ public: void RenderHeroTags(SDL_Surface *screen, const geometry::Vector &offset); void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector &offset); +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 LoadInventory();