added struct for battle resources

[l2e.git] / src / battle / HeroTag.h

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 542b8c1b34190d1d53e2b2d5e92848d6ec252162..d361252dec1e48070ad9197b8d112981eb662cf4 100644 (file)
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -23,6 +23,7 @@ namespace battle {
 
 class AttackChoice;
 class Hero;
+struct Resources;
 
 class HeroTag {
 
@@ -33,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, const graphics::Font *font, Alignment align)
-       : hero(hero), choice(choice), frame(frame), activeFrame(activeFrame), healthGauge(healthGauge), manaGauge(manaGauge), ikariGauge(ikariGauge), sprites(sprites), font(font), align(align) { }
+       HeroTag(const Hero *hero, const AttackChoice *choice, const Resources *res, Alignment align)
+       : hero(hero), choice(choice), res(res), align(align) { }
        ~HeroTag() { }
 
 public:
@@ -43,13 +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 graphics::Font *font;
+       const Resources *res;
        Alignment align;
 
 };