removed useless (and irritating) destructors of battle states

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index f4f8bc1c3093aed7ce4cc8fffb907975f839ee3e..72342f0961e0616de36b058305a7fa30127722a5 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -23,7 +23,9 @@
 
 namespace app { class Input; }
 namespace graphics {
+       class Font;
        class Frame;
+       class Gauge;
        class Sprite;
 }
 
@@ -35,12 +37,17 @@ 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 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)
        : background(background)
        , monstersLayout(&monstersLayout)
        , heroesLayout(&heroesLayout)
        , heroTagFrame(heroTagFrame)
        , activeHeroTagFrame(activeHeroTagFrame)
+       , healthGauge(healthGauge)
+       , manaGauge(manaGauge)
+       , ikariGauge(ikariGauge)
+       , heroTagSprites(heroTagSprites)
+       , heroTagFont(heroTagFont)
        , attackTypeMenu(attackIcons)
        , moveMenu(moveIcons)
        , activeHero(-1) { }
@@ -91,6 +98,11 @@ private:
        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;
        AttackTypeMenu attackTypeMenu;
        MoveMenu moveMenu;
        std::vector<geometry::Point<int> > monsterPositions;