X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=f4f8bc1c3093aed7ce4cc8fffb907975f839ee3e;hb=c8dccd84477d10dcd3ec884478a9f26c16b54ad7;hp=12c55f71856d1536cc12e432ec7cca0777f72b03;hpb=2a0eca649009f78028db286a67a532429cab5b88;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 12c55f7..f4f8bc1 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -22,21 +22,25 @@
 #include <SDL.h>
 
 namespace app { class Input; }
-namespace graphics { class Sprite; }
+namespace graphics {
+	class Frame;
+	class Sprite;
+}
 
 namespace battle {
 
 class PartyLayout;
 
-// TODO: maybe split battle state into substates for each menu?
 class BattleState
 : public app::State {
 
 public:
-	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons, const graphics::Sprite *moveIcons)
+	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)
 	: background(background)
 	, monstersLayout(&monstersLayout)
 	, heroesLayout(&heroesLayout)
+	, heroTagFrame(heroTagFrame)
+	, activeHeroTagFrame(activeHeroTagFrame)
 	, attackTypeMenu(attackIcons)
 	, moveMenu(moveIcons)
 	, activeHero(-1) { }
@@ -85,6 +89,8 @@ private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
 	const PartyLayout *heroesLayout;
+	const graphics::Frame *heroTagFrame;
+	const graphics::Frame *activeHeroTagFrame;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
 	std::vector<geometry::Point<int> > monsterPositions;