X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHeroTag.h;h=9ce1963cb854209d8ef177a9080deb5dbdada9c6;hb=f552d26f537af9fa48255bd71cdc1a0a1b860bac;hp=6799e9470fd75a1c6445e3573ff3ce7032886f52;hpb=cccda573516f3bce30efbaba3fc20e4148d3cdc8;p=l2e.git

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 6799e94..9ce1963 100644
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -8,39 +8,31 @@
 #ifndef BATTLE_HEROTAG_H_
 #define BATTLE_HEROTAG_H_
 
-#include "../geometry/Point.h"
+#include "fwd.h"
+#include "Hero.h"
+#include "../geometry/Vector.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace graphics { class Frame; }
-
 namespace battle {
 
-class AttackChoice;
-class Hero;
-
 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, Alignment align)
-	: hero(hero), choice(choice), frame(frame), activeFrame(activeFrame), 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;
-	Alignment align;
+	const BattleState *battle;
+	int index;
 
 };