X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=205397a46a72db682f3085bf015a9ad266d36700;hb=d997e6743dfa0df245bc3f59ee97ecd63efb3c4f;hp=05bd7c95128ae6352b9360d3b1cc34243aab89a4;hpb=95bfa881f3fa427b67d9ce21e6a10f80f7be5439;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 05bd7c9..205397a 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,6 +8,7 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#include "Hero.h"
 #include "Monster.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
@@ -23,14 +24,21 @@ class BattleState
 : public app::State {
 
 public:
-	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout)
+	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout)
 	: background(background)
-	, monstersLayout(&monstersLayout) { }
+	, monstersLayout(&monstersLayout)
+	, heroesLayout(&heroesLayout) { }
+
+public:
+	void AddMonster(const Monster &);
+	void AddHero(const Hero &);
 
 public:
 	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
 	virtual void ExitState();
 
+	virtual void Resize(int width, int height);
+
 	virtual void HandleEvent(const SDL_Event &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
@@ -38,8 +46,11 @@ public:
 private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
+	const PartyLayout *heroesLayout;
 	std::vector<geometry::Point<int> > monsterPositions;
+	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
+	std::vector<Hero> heroes;
 
 };