X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.h;h=daf1cae65f10c0f4c85267cdfc34bf39368360a1;hb=628b3a7276d0b330719e05504b23bafcf88f8fca;hp=397e5e3b02a59314bd97dc7518c2746d25ab54b7;hpb=867fd5d9b79c3b9c1d0fb17ba9f55cfe971b93d5;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 397e5e3..daf1cae 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,8 +8,11 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#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"
@@ -18,19 +21,25 @@
 #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, const graphics::Sprite *moveIcons)
 	: background(background)
 	, monstersLayout(&monstersLayout)
-	, heroesLayout(&heroesLayout) { }
+	, heroesLayout(&heroesLayout)
+	, attackTypeMenu(attackIcons)
+	, moveMenu(moveIcons)
+	, moveChoice(-1)
+	, activeHero(0) { }
 
 public:
 	void AddMonster(const Monster &);
@@ -50,15 +59,23 @@ private:
 	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);
+	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;
 
 };