X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.h;h=67e0b786beb39364b390d0978f897a5a08ac82ad;hb=2955f56fb11fab871a34db5700befe55737d81d7;hp=52238ebe5d3594b964cd656aa10bd5094e793e51;hpb=4a1816af30dcfe53181a25355bd51cc7b24a83f1;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 52238eb..67e0b78 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,9 +8,11 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#include "Hero.h"
 #include "Monster.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 
 #include <vector>
 #include <SDL.h>
@@ -23,14 +25,14 @@ 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)
-	, width(0)
-	, height(0) { }
+	, heroesLayout(&heroesLayout) { }
 
 public:
 	void AddMonster(const Monster &);
+	void AddHero(const Hero &);
 
 public:
 	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
@@ -42,13 +44,19 @@ public:
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
+private:
+	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);
+
 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;
-	int width;
-	int height;
+	std::vector<Hero> heroes;
 
 };