X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=inline;f=src%2Fbattle%2FBattleState.h;h=a3c0879cedbbace7352a0ad547a090e9be8e41ae;hb=558fd3d14ad1a9dc347998691a0b300fd334a16a;hp=8fa7d951ac393bcf5dd5917cc36d2b34f44bbce5;hpb=010a336797f1419945bed60560cc61fb492793f4;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 8fa7d95..a3c0879 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -12,6 +12,7 @@
 #include "Hero.h"
 #include "HeroTag.h"
 #include "Monster.h"
+#include "MoveMenu.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
@@ -31,11 +32,14 @@ class BattleState
 : public app::State {
 
 public:
-	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons)
+	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons, const graphics::Sprite *moveIcons)
 	: background(background)
 	, monstersLayout(&monstersLayout)
 	, heroesLayout(&heroesLayout)
-	, attackTypeMenu(attackIcons) { }
+	, attackTypeMenu(attackIcons)
+	, moveMenu(moveIcons)
+	, moveChoice(-1)
+	, activeHero(0) { }
 
 public:
 	void AddMonster(const Monster &);
@@ -51,7 +55,19 @@ public:
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
-private:
+public:
+	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
+	MoveMenu &GetMoveMenu() { return moveMenu; }
+
+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);
@@ -63,11 +79,14 @@ private:
 	const PartyLayout *monstersLayout;
 	const PartyLayout *heroesLayout;
 	AttackTypeMenu attackTypeMenu;
+	MoveMenu moveMenu;
 	std::vector<geometry::Point<int> > monsterPositions;
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
 	std::vector<HeroTag> heroTags;
+	int moveChoice;
+	int activeHero;
 
 };