X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=484e4529c6a49d7d78776b3de9420f286a96bcdf;hb=d7927b645a22776d6e1e1c209365e8f74c4350e9;hp=f4f8bc1c3093aed7ce4cc8fffb907975f839ee3e;hpb=cccda573516f3bce30efbaba3fc20e4148d3cdc8;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index f4f8bc1..484e452 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -14,6 +14,7 @@
 #include "HeroTag.h"
 #include "Monster.h"
 #include "MoveMenu.h"
+#include "Resources.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
@@ -23,7 +24,9 @@
 
 namespace app { class Input; }
 namespace graphics {
+	class Font;
 	class Frame;
+	class Gauge;
 	class Sprite;
 }
 
@@ -35,14 +38,13 @@ 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)
+	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const Resources *res)
 	: background(background)
 	, monstersLayout(&monstersLayout)
 	, heroesLayout(&heroesLayout)
-	, heroTagFrame(heroTagFrame)
-	, activeHeroTagFrame(activeHeroTagFrame)
-	, attackTypeMenu(attackIcons)
-	, moveMenu(moveIcons)
+	, res(res)
+	, attackTypeMenu(res->attackIcons)
+	, moveMenu(res->moveIcons)
 	, activeHero(-1) { }
 
 public:
@@ -62,11 +64,16 @@ public:
 	virtual void Render(SDL_Surface *);
 
 public:
+	const Resources &Res() const { return *res; }
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
 	MoveMenu &GetMoveMenu() { return moveMenu; }
 
 	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(); }
@@ -89,8 +96,7 @@ private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
 	const PartyLayout *heroesLayout;
-	const graphics::Frame *heroTagFrame;
-	const graphics::Frame *activeHeroTagFrame;
+	const Resources *res;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
 	std::vector<geometry::Point<int> > monsterPositions;