X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=3a9500c5d5228d41c2bd71ba42a27d593c41a4a3;hb=e1edc92c4fb834c8061118e89c0d7e239742b030;hp=4ac64594ba498d35b3e2dfae0fd4d604176247a0;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 4ac6459..3a9500c 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -1,15 +1,9 @@
-/*
- * BattleState.h
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
 #include "fwd.h"
 #include "AttackTypeMenu.h"
+#include "Capsule.h"
 #include "Hero.h"
 #include "HeroTag.h"
 #include "Monster.h"
@@ -54,15 +48,9 @@ public:
 public:
 	void AddMonster(const Monster &);
 	void AddHero(const Hero &);
+	void SetCapsule(const Capsule &);
 
 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 Resize(int width, int height);
-
 	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
@@ -134,9 +122,18 @@ public:
 	void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderCapsule(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &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();
 
@@ -160,6 +157,7 @@ private:
 	SmallHeroTag smallHeroTags[4];
 	geometry::Vector<int> heroTagPositions[4];
 	geometry::Vector<int> smallHeroTagPositions[4];
+	Capsule capsule;
 	int numHeroes;
 	int activeHero;
 	int attackCursor;