X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHeroTag.h;h=8750081148cb8c94b58c845d411cf6cfd462947a;hb=93cd8cb0f16c1809d76faa33ed6f281a3276140b;hp=5f122cf5d5b77fd24eb3f1f5e3a0d9502ad46681;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 5f122cf..8750081 100644
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -9,7 +9,6 @@
 #define BATTLE_HEROTAG_H_
 
 #include "Hero.h"
-#include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 
 #include <SDL.h>
@@ -23,34 +22,24 @@ namespace graphics {
 
 namespace battle {
 
-class AttackChoice;
-struct Resources;
+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() : hero(0), choice(0), res(0), align(LEFT) { };
-	HeroTag(const Hero *hero, const AttackChoice *choice, const Resources *res, Alignment align)
-	: hero(hero), choice(choice), res(res), align(align) { }
-	~HeroTag() { }
-
-public:
-	const graphics::Sprite *HeroSprite() const { return hero->Sprite(); }
+	const graphics::Sprite *HeroSprite() const;
 	geometry::Vector<int> HeroOffset() const;
 
-	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 Resources *res;
-	Alignment align;
+	const BattleState *battle;
+	int index;
 
 };