X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=9e504ed8c13b04db85168aa5bf7acd2cb672a4e4;hb=c0860451b5fd681c3b3b8d985e8831276bbd917f;hp=67e0b786beb39364b390d0978f897a5a08ac82ad;hpb=2955f56fb11fab871a34db5700befe55737d81d7;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 67e0b78..9e504ed 100644
--- 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"
@@ -17,18 +18,23 @@
 #include <vector>
 #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 &);
@@ -40,7 +46,7 @@ public:
 
 	virtual void Resize(int width, int height);
 
-	virtual void HandleEvent(const SDL_Event &);
+	virtual void HandleInput(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
@@ -53,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;