X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=a3c0879cedbbace7352a0ad547a090e9be8e41ae;hb=558fd3d14ad1a9dc347998691a0b300fd334a16a;hp=205397a46a72db682f3085bf015a9ad266d36700;hpb=d997e6743dfa0df245bc3f59ee97ecd63efb3c4f;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 205397a..a3c0879 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,26 +8,38 @@
 #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"
 
 #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, 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 &);
@@ -39,18 +51,42 @@ 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 *);
 
+public:
+	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
+	MoveMenu &GetMoveMenu() { return moveMenu; }
+
+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 moveChoice;
+	int activeHero;
 
 };