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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 858b111..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"
@@ -37,20 +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, const graphics::Gauge *healthGauge, const graphics::Gauge *manaGauge, const graphics::Gauge *ikariGauge, const graphics::Sprite *heroTagSprites, const graphics::Font *heroTagFont, const graphics::Frame *selectFrame)
+	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const Resources *res)
 	: background(background)
 	, monstersLayout(&monstersLayout)
 	, heroesLayout(&heroesLayout)
-	, heroTagFrame(heroTagFrame)
-	, activeHeroTagFrame(activeHeroTagFrame)
-	, healthGauge(healthGauge)
-	, manaGauge(manaGauge)
-	, ikariGauge(ikariGauge)
-	, heroTagSprites(heroTagSprites)
-	, heroTagFont(heroTagFont)
-	, selectFrame(selectFrame)
-	, attackTypeMenu(attackIcons)
-	, moveMenu(moveIcons)
+	, res(res)
+	, attackTypeMenu(res->attackIcons)
+	, moveMenu(res->moveIcons)
 	, activeHero(-1) { }
 
 public:
@@ -70,9 +64,9 @@ public:
 	virtual void Render(SDL_Surface *);
 
 public:
+	const Resources &Res() const { return *res; }
 	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; }
@@ -102,14 +96,7 @@ private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
 	const PartyLayout *heroesLayout;
-	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;
+	const Resources *res;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
 	std::vector<geometry::Point<int> > monsterPositions;