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

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 5f122cf..d3bd9f5 100644
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -1,59 +1,40 @@
-/*
- * HeroTag.h
- *
- *  Created on: Aug 6, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_HEROTAG_H_
 #define BATTLE_HEROTAG_H_
 
-#include "Hero.h"
-#include "../geometry/Point.h"
-#include "../geometry/Vector.h"
-
-#include <SDL.h>
-
+namespace battle {
+	class BattleState;
+}
 namespace graphics {
-	class Font;
-	class Frame;
-	class Gauge;
 	class Sprite;
 }
+namespace math {
+	template<class>
+	class Vector;
+}
 
-namespace battle {
+#include <SDL.h>
 
-class AttackChoice;
-struct Resources;
+namespace battle {
 
 class HeroTag {
 
 public:
-	enum Alignment {
-		LEFT,
-		RIGHT
-	};
-
-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() { }
+	HeroTag() : battle(0), index(0) { }
+	HeroTag(const BattleState *battle, int heroIndex)
+	: battle(battle), index(heroIndex) { }
 
 public:
-	const graphics::Sprite *HeroSprite() const { return hero->Sprite(); }
-	geometry::Vector<int> HeroOffset() const;
+	const graphics::Sprite *HeroSprite() const;
+	math::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 math::Vector<int> &position, bool active) const;
 
 private:
-	const Hero *hero;
-	const AttackChoice *choice;
-	const Resources *res;
-	Alignment align;
+	const BattleState *battle;
+	int index;
 
 };
 
 }
 
-#endif /* BATTLE_HEROTAG_H_ */
+#endif