added battle move menu

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 8fa7d951ac393bcf5dd5917cc36d2b34f44bbce5..daf1cae65f10c0f4c85267cdfc34bf39368360a1 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -12,6 +12,7 @@
 #include "Hero.h"
 #include "HeroTag.h"
 #include "Monster.h"
+#include "MoveMenu.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
@@ -31,11 +32,14 @@ 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)
+       , moveChoice(-1)
+       , activeHero(0) { }
 
 public:
        void AddMonster(const Monster &);
@@ -57,17 +61,21 @@ private:
        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);
+       void RenderMoveMenu(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 moveChoice;
+       int activeHero;
 
 };