added attack type selection menu in battle state

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 397e5e3b02a59314bd97dc7518c2746d25ab54b7..9e504ed8c13b04db85168aa5bf7acd2cb672a4e4 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,6 +8,7 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#include "AttackTypeMenu.h"
 #include "Hero.h"
 #include "Monster.h"
 #include "../app/State.h"
@@ -18,19 +19,22 @@
 #include <SDL.h>
 
 namespace app { class Input; }
+namespace graphics { class Sprite; }
 
 namespace battle {
 
 class PartyLayout;
 
+// TODO: maybe split battle state into substates for each menu?
 class BattleState
 : public app::State {
 
 public:
-       BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout)
+       BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const graphics::Sprite *attackIcons)
        : background(background)
        , monstersLayout(&monstersLayout)
-       , heroesLayout(&heroesLayout) { }
+       , heroesLayout(&heroesLayout)
+       , attackTypeMenu(attackIcons) { }
 
 public:
        void AddMonster(const Monster &);
@@ -55,6 +59,7 @@ private:
        SDL_Surface *background;
        const PartyLayout *monstersLayout;
        const PartyLayout *heroesLayout;
+       AttackTypeMenu attackTypeMenu;
        std::vector<geometry::Point<int> > monsterPositions;
        std::vector<geometry::Point<int> > heroesPositions;
        std::vector<Monster> monsters;