X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHeroTag.h;h=24c8f8a6da4109c4e564023d9f1211cd83e98a0b;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=542b8c1b34190d1d53e2b2d5e92848d6ec252162;hpb=ca31ddeab37eebaa2de5e5b1c94974fac06d418b;p=l2e.git

diff --git a/src/battle/HeroTag.h b/src/battle/HeroTag.h
index 542b8c1..24c8f8a 100644
--- a/src/battle/HeroTag.h
+++ b/src/battle/HeroTag.h
@@ -1,56 +1,31 @@
-/*
- * HeroTag.h
- *
- *  Created on: Aug 6, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_HEROTAG_H_
 #define BATTLE_HEROTAG_H_
 
-#include "../geometry/Point.h"
+#include "fwd.h"
+#include "Hero.h"
+#include "../math/Vector.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace graphics {
-	class Font;
-	class Frame;
-	class Gauge;
-	class Sprite;
-}
-
 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, const graphics::Gauge *healthGauge, const graphics::Gauge *manaGauge, const graphics::Gauge *ikariGauge, const graphics::Sprite *sprites, const graphics::Font *font, Alignment align)
-	: hero(hero), choice(choice), frame(frame), activeFrame(activeFrame), healthGauge(healthGauge), manaGauge(manaGauge), ikariGauge(ikariGauge), sprites(sprites), font(font), align(align) { }
-	~HeroTag() { }
+	const graphics::Sprite *HeroSprite() const;
+	math::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 math::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;
-	const graphics::Font *font;
-	Alignment align;
+	const BattleState *battle;
+	int index;
 
 };