alternate approach to battle animation

[l2e.git] / src / battle / Hero.h

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index c0bd41a024d8f6db16b6accfcf3a345cbbe6b089..e200838487a177cef24e2ea0b200d1a35a99867f 100644 (file)
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -22,8 +22,6 @@ namespace graphics {
 
 namespace battle {
 
-class AttackAnimation;
-
 class Hero {
 
 public:
@@ -71,8 +69,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; }
@@ -99,7 +97,7 @@ public:
 
        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; }
 
@@ -114,7 +112,7 @@ private:
        const common::Item *ring;
        const common::Item *jewel;
 
-       class AttackAnimation *meleeAnimation;
+       graphics::Animation *meleeAnimation;
        graphics::Animation *attackAnimation;
        graphics::Animation *spellAnimation;