diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2016-03-20 20:49:37 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2016-03-20 20:49:37 +0100 |
| commit | 052603a7e818087da0769c4b58f039d0b48af6fc (patch) | |
| tree | 69fcf9a8e6eff4b36ccd2c8c4dec4696e68255d0 | |
| parent | c498966d23933e323685c3a767d3fe334a60af22 (diff) | |
fixed build
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 33b345cc5af..806c50ddcc7 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1023,10 +1023,7 @@ struct ResurrectionData uint32 Aura; }; -enum Spells -{ - SPELL_DK_RAISE_ALLY = 46619 -}; +#define SPELL_DK_RAISE_ALLY 46619 class Player : public Unit, public GridObject<Player> { diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6711ed2d157..96ccc2c87d6 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12565,6 +12565,11 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) } } +bool Unit::IsGhouled() const +{ + return HasAura(SPELL_DK_RAISE_ALLY); +} + void Unit::setDeathState(DeathState s) { // Death state needs to be updated before RemoveAllAurasOnDeath() is called, to prevent entering combat diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 38caa43598a..b1b93f1c987 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1602,7 +1602,7 @@ class Unit : public WorldObject bool IsAlive() const { return (m_deathState == ALIVE); } bool isDying() const { return (m_deathState == JUST_DIED); } bool isDead() const { return (m_deathState == DEAD || m_deathState == CORPSE); } - bool IsGhouled() const { return HasAura(SPELL_DK_RAISE_ALLY); } + bool IsGhouled() const; DeathState getDeathState() const { return m_deathState; } virtual void setDeathState(DeathState s); // overwrited in Creature/Player/Pet diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index cf26b9c116e..fe7309ce68c 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -65,8 +65,6 @@ enum DeathKnightSpells SPELL_DK_UNHOLY_PRESENCE_TRIGGERED = 49772, SPELL_DK_WILL_OF_THE_NECROPOLIS_TALENT_R1 = 49189, SPELL_DK_WILL_OF_THE_NECROPOLIS_AURA_R1 = 52284, - SPELL_DK_RAISE_ALLY_INITIAL = 61999, - SPELL_DK_RAISE_ALLY = 46619, SPELL_DK_GHOUL_THRASH = 47480 }; |