X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.h;h=858b111c426283008570054b8f48030dee72901a;hb=185c6c79f8ba30981aad4e1d66f98143a344b95e;hp=0e3436b1fcda93164eafa8b2f801951219a4d1a0;hpb=0ef4dc19f03955b82d22330342acb179cf12b551;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 0e3436b..858b111 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -23,6 +23,7 @@
 
 namespace app { class Input; }
 namespace graphics {
+	class Font;
 	class Frame;
 	class Gauge;
 	class Sprite;
@@ -36,7 +37,7 @@ class BattleState
 : public app::State {
 
 public:
-	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons, const graphics::Sprite *moveIcons, const graphics::Frame *heroTagFrame, const graphics::Frame *activeHeroTagFrame, const graphics::Gauge *healthGauge, const graphics::Gauge *manaGauge, const graphics::Gauge *ikariGauge, const graphics::Sprite *heroTagSprites)
+	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons, const graphics::Sprite *moveIcons, const graphics::Frame *heroTagFrame, const graphics::Frame *activeHeroTagFrame, const graphics::Gauge *healthGauge, const graphics::Gauge *manaGauge, const graphics::Gauge *ikariGauge, const graphics::Sprite *heroTagSprites, const graphics::Font *heroTagFont, const graphics::Frame *selectFrame)
 	: background(background)
 	, monstersLayout(&monstersLayout)
 	, heroesLayout(&heroesLayout)
@@ -46,6 +47,8 @@ public:
 	, manaGauge(manaGauge)
 	, ikariGauge(ikariGauge)
 	, heroTagSprites(heroTagSprites)
+	, heroTagFont(heroTagFont)
+	, selectFrame(selectFrame)
 	, attackTypeMenu(attackIcons)
 	, moveMenu(moveIcons)
 	, activeHero(-1) { }
@@ -69,9 +72,14 @@ public:
 public:
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
 	MoveMenu &GetMoveMenu() { return moveMenu; }
+	const graphics::Frame &GetSelectFrame() const { return *selectFrame; }
 
 	bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); }
 	void NextHero() { ++activeHero; }
+	bool BeforeFirstHero() const { return activeHero < 0; }
+	void PreviousHero() { --activeHero; }
+	Hero &ActiveHero() { return heroes[activeHero]; }
+	const Hero &ActiveHero() const { return heroes[activeHero]; }
 	bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
 	void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
 	bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
@@ -100,6 +108,8 @@ private:
 	const graphics::Gauge *manaGauge;
 	const graphics::Gauge *ikariGauge;
 	const graphics::Sprite *heroTagSprites;
+	const graphics::Font *heroTagFont;
+	const graphics::Frame *selectFrame;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
 	std::vector<geometry::Point<int> > monsterPositions;