moved attack type into its own class

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 9e504ed8c13b04db85168aa5bf7acd2cb672a4e4..73f3fbc01813c478870d6cb42ff7988b87872c9b 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -10,7 +10,9 @@
 
 #include "AttackTypeMenu.h"
 #include "Hero.h"
+#include "HeroTag.h"
 #include "Monster.h"
+#include "MoveMenu.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
@@ -30,11 +32,13 @@ class BattleState
 : public app::State {
 
 public:
-       BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons)
+       BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons, const graphics::Sprite *moveIcons)
        : background(background)
        , monstersLayout(&monstersLayout)
        , heroesLayout(&heroesLayout)
-       , attackTypeMenu(attackIcons) { }
+       , attackTypeMenu(attackIcons)
+       , moveMenu(moveIcons)
+       , activeHero(-1) { }
 
 public:
        void AddMonster(const Monster &);
@@ -50,20 +54,40 @@ public:
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
-private:
+public:
+       AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
+       MoveMenu &GetMoveMenu() { return moveMenu; }
+
+       bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); }
+       void NextHero() { ++activeHero; }
+
+public:
+       geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
+               return geometry::Vector<int>(
+                               (screen->w - background->w) / 2,
+                               (screen->h - background->h) / 2);
+       }
+       int BackgroundWidth() const { return background->w; }
+       int BackgroundHeight() const { return background->h; }
+
        void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
        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 RenderAttackTypeMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
        SDL_Surface *background;
        const PartyLayout *monstersLayout;
        const PartyLayout *heroesLayout;
        AttackTypeMenu attackTypeMenu;
+       MoveMenu moveMenu;
        std::vector<geometry::Point<int> > monsterPositions;
        std::vector<geometry::Point<int> > heroesPositions;
        std::vector<Monster> monsters;
        std::vector<Hero> heroes;
+       std::vector<HeroTag> heroTags;
+       int activeHero;
 
 };