X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.h;h=73f3fbc01813c478870d6cb42ff7988b87872c9b;hb=4d0a650b178d81387caa36953ed06cc5d6c28213;hp=daf1cae65f10c0f4c85267cdfc34bf39368360a1;hpb=628b3a7276d0b330719e05504b23bafcf88f8fca;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index daf1cae..73f3fbc 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -38,8 +38,7 @@ public:
 	, heroesLayout(&heroesLayout)
 	, attackTypeMenu(attackIcons)
 	, moveMenu(moveIcons)
-	, moveChoice(-1)
-	, activeHero(0) { }
+	, activeHero(-1) { }
 
 public:
 	void AddMonster(const Monster &);
@@ -55,13 +54,27 @@ public:
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
-private:
+public:
+	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
+	MoveMenu &GetMoveMenu() { return moveMenu; }
+
+	bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); }
+	void NextHero() { ++activeHero; }
+
+public:
+	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
+		return geometry::Vector<int>(
+				(screen->w - background->w) / 2,
+				(screen->h - background->h) / 2);
+	}
+	int BackgroundWidth() const { return background->w; }
+	int BackgroundHeight() const { return background->h; }
+
 	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 RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderAttackTypeMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderMoveMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
 	SDL_Surface *background;
@@ -74,7 +87,6 @@ private:
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
 	std::vector<HeroTag> heroTags;
-	int moveChoice;
 	int activeHero;
 
 };