X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHeroTag.h;h=8750081148cb8c94b58c845d411cf6cfd462947a;hb=3ecf065f3bcef720e82bb137a2be734ed7e16746;hp=004d3eced8fa11d5b93897964d1a45d6934ee617;hpb=0ef4dc19f03955b82d22330342acb179cf12b551;p=l2e.git

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 004d3ec..8750081 100644
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -8,11 +8,13 @@
 #ifndef BATTLE_HEROTAG_H_
 #define BATTLE_HEROTAG_H_
 
-#include "../geometry/Point.h"
+#include "Hero.h"
+#include "../geometry/Vector.h"
 
 #include <SDL.h>
 
 namespace graphics {
+	class Font;
 	class Frame;
 	class Gauge;
 	class Sprite;
@@ -20,35 +22,24 @@ namespace graphics {
 
 namespace battle {
 
-class AttackChoice;
-class Hero;
+class BattleState;
 
 class HeroTag {
 
 public:
-	enum Alignment {
-		LEFT,
-		RIGHT
-	};
+	HeroTag() : battle(0), index(0) { }
+	HeroTag(const BattleState *battle, int heroIndex)
+	: battle(battle), index(heroIndex) { }
 
 public:
-	HeroTag(const Hero *hero, const AttackChoice *choice, const graphics::Frame *frame, const graphics::Frame *activeFrame, const graphics::Gauge *healthGauge, const graphics::Gauge *manaGauge, const graphics::Gauge *ikariGauge, const graphics::Sprite *sprites, Alignment align)
-	: hero(hero), choice(choice), frame(frame), activeFrame(activeFrame), healthGauge(healthGauge), manaGauge(manaGauge), ikariGauge(ikariGauge), sprites(sprites), align(align) { }
-	~HeroTag() { }
+	const graphics::Sprite *HeroSprite() const;
+	geometry::Vector<int> HeroOffset() const;
 
-public:
-	void Render(SDL_Surface *screen, int width, int height, geometry::Point<int> position, bool active) const;
+	void Render(SDL_Surface *screen, int width, int height, const geometry::Vector<int> &position, bool active) const;
 
 private:
-	const Hero *hero;
-	const AttackChoice *choice;
-	const graphics::Frame *frame;
-	const graphics::Frame *activeFrame;
-	const graphics::Gauge *healthGauge;
-	const graphics::Gauge *manaGauge;
-	const graphics::Gauge *ikariGauge;
-	const graphics::Sprite *sprites;
-	Alignment align;
+	const BattleState *battle;
+	int index;
 
 };