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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index b88bae3..67e0b78 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,32 +8,55 @@
 #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>
 
 namespace battle {
 
+class PartyLayout;
+
 class BattleState
 : public app::State {
 
 public:
-	explicit BattleState(SDL_Surface *background)
-	: background(background) { }
+	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout)
+	: background(background)
+	, 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 *);
 
+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;
+	std::vector<Hero> heroes;
 
 };