X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHeroTag.h;h=d361252dec1e48070ad9197b8d112981eb662cf4;hb=536a8c96ebfec2a2b34f680d3d0b97db8e66d599;hp=004d3eced8fa11d5b93897964d1a45d6934ee617;hpb=0ef4dc19f03955b82d22330342acb179cf12b551;p=l2e.git

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 004d3ec..d361252 100644
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -13,6 +13,7 @@
 #include <SDL.h>
 
 namespace graphics {
+	class Font;
 	class Frame;
 	class Gauge;
 	class Sprite;
@@ -22,6 +23,7 @@ namespace battle {
 
 class AttackChoice;
 class Hero;
+struct Resources;
 
 class HeroTag {
 
@@ -32,8 +34,8 @@ public:
 	};
 
 public:
-	HeroTag(const Hero *hero, const AttackChoice *choice, const graphics::Frame *frame, const graphics::Frame *activeFrame, const graphics::Gauge *healthGauge, const graphics::Gauge *manaGauge, const graphics::Gauge *ikariGauge, const graphics::Sprite *sprites, Alignment align)
-	: hero(hero), choice(choice), frame(frame), activeFrame(activeFrame), healthGauge(healthGauge), manaGauge(manaGauge), ikariGauge(ikariGauge), sprites(sprites), align(align) { }
+	HeroTag(const Hero *hero, const AttackChoice *choice, const Resources *res, Alignment align)
+	: hero(hero), choice(choice), res(res), align(align) { }
 	~HeroTag() { }
 
 public:
@@ -42,12 +44,7 @@ public:
 private:
 	const Hero *hero;
 	const AttackChoice *choice;
-	const graphics::Frame *frame;
-	const graphics::Frame *activeFrame;
-	const graphics::Gauge *healthGauge;
-	const graphics::Gauge *manaGauge;
-	const graphics::Gauge *ikariGauge;
-	const graphics::Sprite *sprites;
+	const Resources *res;
 	Alignment align;
 
 };