fixed disabled font

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index f5bf9cb1b915ee9e60de2a3516104adac9842052..77e2b5dbdfa214db81bcd6a8f1313b18e05ce49f 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -15,10 +15,12 @@
 #include "Monster.h"
 #include "MoveMenu.h"
 #include "Resources.h"
+#include "SmallHeroTag.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Menu.h"
+#include "../graphics/SimpleAnimation.h"
 
 #include <vector>
 #include <SDL.h>
@@ -83,8 +85,7 @@ public:
        graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
        const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
-       bool HasMoreHeroes() const { return activeHero < numHeroes; }
-       void NextHero() { ++activeHero; }
+       void NextHero();
        bool BeforeFirstHero() const { return activeHero < 0; }
        void PreviousHero() { --activeHero; }
        void SwapHeroes(int lhs, int rhs);
@@ -96,6 +97,9 @@ public:
        Monster &MonsterAt(int index) { return monsters[index]; }
        const Monster &MonsterAt(int index) const { return monsters[index]; }
 
+       graphics::SimpleAnimation &HeroAnimationAt(int index) { return heroAnimations[index]; }
+       const graphics::SimpleAnimation &HeroAnimationAt(int index) const { return heroAnimations[index]; }
+
        const HeroTag &HeroTagAt(int index) const { return heroTags[index]; }
        const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[index]; }
 
@@ -106,12 +110,13 @@ public:
        bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
        int NumHeroes() const { return numHeroes; }
+       int MaxHeroes() const { return 4; }
        int MaxMonsters() const { return monsters.size(); }
 
        const std::vector<geometry::Point<int> > &MonsterPositions() const { return monsterPositions; }
        bool MonsterPositionOccupied(int index) { return index >= 0 && index < int(monsters.size()) && monsters[index].Health() > 0; }
        const std::vector<geometry::Point<int> > &HeroesPositions() const { return heroesPositions; }
-       bool HeroPositionOccupied(int index) { return index >= 0 && index < numHeroes; }
+       bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; }
 
        void SetRunaway() { ranAway = true; }
        void ClearAllAttacks();
@@ -129,6 +134,7 @@ public:
        void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
        void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
        void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
        void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
@@ -147,11 +153,14 @@ private:
        std::vector<geometry::Point<int> > heroesPositions;
        std::vector<Monster> monsters;
        Hero heroes[4];
+       graphics::SimpleAnimation heroAnimations[4];
        graphics::Menu<const common::Spell *> spellMenus[4];
        graphics::Menu<const common::Item *> itemMenu;
        graphics::Menu<const common::Item *> ikariMenus[4];
        HeroTag heroTags[4];
+       SmallHeroTag smallHeroTags[4];
        geometry::Point<int> heroTagPositions[4];
+       geometry::Point<int> smallHeroTagPositions[4];
        AttackChoice attackChoices[4];
        int numHeroes;
        int activeHero;