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 b56b9fe3d55cd262dab2ff1e5acec7ad2f65e7d9..72342f0961e0616de36b058305a7fa30127722a5 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -23,6 +23,7 @@
 
 namespace app { class Input; }
 namespace graphics {
+       class Font;
        class Frame;
        class Gauge;
        class Sprite;
@@ -36,7 +37,7 @@ 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)
+       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)
@@ -45,6 +46,8 @@ public:
        , healthGauge(healthGauge)
        , manaGauge(manaGauge)
        , ikariGauge(ikariGauge)
+       , heroTagSprites(heroTagSprites)
+       , heroTagFont(heroTagFont)
        , attackTypeMenu(attackIcons)
        , moveMenu(moveIcons)
        , activeHero(-1) { }
@@ -98,6 +101,8 @@ private:
        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;