X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=7abfb68fb35ae5f8a0cd16e243678546cf58074e;hb=fbf5a98f8fd0da951e469003fe87d575a6bb30a4;hp=c0bd41a024d8f6db16b6accfcf3a345cbbe6b089;hpb=8456b7dac2051bfd2b507a39854c1428eb4d91cd;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index c0bd41a..7abfb68 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -22,8 +22,6 @@ namespace graphics {
 
 namespace battle {
 
-class AttackAnimation;
-
 class Hero {
 
 public:
@@ -40,6 +38,7 @@ public:
 	Uint16 MaxHealth() const { return maxHealth; }
 	Uint16 Health() const { return health; }
 	int RelativeHealth(int max) const { return Health() * max / MaxHealth(); }
+	void SubtractHealth(int amount);
 
 	Uint16 MaxMana() const { return maxMana; }
 	Uint16 Mana() const { return mana; }
@@ -57,6 +56,13 @@ public:
 	Uint16 Gut() const { return gut; }
 	Uint16 MagicResistance() const { return magicResistance; }
 
+	common::Item *Weapon() { return weapon; }
+	common::Item *Armor() { return armor; }
+	common::Item *Shield() { return shield; }
+	common::Item *Helmet() { return helmet; }
+	common::Item *Ring() { return ring; }
+	common::Item *Jewel() { return jewel; }
+
 	const common::Item *Weapon() const { return weapon; }
 	const common::Item *Armor() const { return armor; }
 	const common::Item *Shield() const { return shield; }
@@ -71,8 +77,8 @@ public:
 	bool HasRing() const { return ring; }
 	bool HasJewel() const { return jewel; }
 
-	class AttackAnimation *MeleeAnimation() { return meleeAnimation; }
-	const class AttackAnimation *MeleeAnimation() const { return meleeAnimation; }
+	graphics::Animation *MeleeAnimation() { return meleeAnimation; }
+	const graphics::Animation *MeleeAnimation() const { return meleeAnimation; }
 	graphics::Animation *AttackAnimation() { return attackAnimation; }
 	const graphics::Animation *AttackAnimation() const { return attackAnimation; }
 	graphics::Animation *SpellAnimation() { return spellAnimation; }
@@ -90,16 +96,16 @@ public:
 	void SetMana(Uint16 m) { mana = m; }
 	void SetIP(Uint8 i) { ip = i; }
 
-	void SetWeapon(const common::Item *i) { weapon = i; }
-	void SetArmor(const common::Item *i) { armor = i; }
-	void SetShield(const common::Item *i) { shield = i; }
-	void SetHelmet(const common::Item *i) { helmet = i; }
-	void SetRing(const common::Item *i) { ring = i; }
-	void SetJewel(const common::Item *i) { jewel = i; }
+	void SetWeapon(common::Item *i) { weapon = i; }
+	void SetArmor(common::Item *i) { armor = i; }
+	void SetShield(common::Item *i) { shield = i; }
+	void SetHelmet(common::Item *i) { helmet = i; }
+	void SetRing(common::Item *i) { ring = i; }
+	void SetJewel(common::Item *i) { jewel = i; }
 
 	void AddSpell(const common::Spell *s) { spells.push_back(s); }
 
-	void SetMeleeAnimation(class AttackAnimation *a) { meleeAnimation = a; }
+	void SetMeleeAnimation(graphics::Animation *a) { meleeAnimation = a; }
 	void SetAttackAnimation(graphics::Animation *a) { attackAnimation = a; }
 	void SetSpellAnimation(graphics::Animation *a) { spellAnimation = a; }
 
@@ -107,14 +113,14 @@ private:
 	const char *name;
 	graphics::Sprite *sprite;
 
-	const common::Item *weapon;
-	const common::Item *armor;
-	const common::Item *shield;
-	const common::Item *helmet;
-	const common::Item *ring;
-	const common::Item *jewel;
+	common::Item *weapon;
+	common::Item *armor;
+	common::Item *shield;
+	common::Item *helmet;
+	common::Item *ring;
+	common::Item *jewel;
 
-	class AttackAnimation *meleeAnimation;
+	graphics::Animation *meleeAnimation;
 	graphics::Animation *attackAnimation;
 	graphics::Animation *spellAnimation;