diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-10-19 00:18:06 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-19 00:18:06 +0100 |
| commit | 5bf55eacfdf7cfd0036bf51e78a2f04f9b55feb0 (patch) | |
| tree | 9653ff7011d0b370c1360e09590c09ebec4f7e9a /src/server/game/Spells/Spell.h | |
| parent | e07d3ebe4e6d2d797cb77ba65fb52efbef3462d9 (diff) | |
| parent | 15a9c6729ee274044b2ba78f8b9ad3c167c94bd1 (diff) | |
Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
Conflicts:
sql/base/auth_database.sql
src/server/game/Instances/InstanceScript.h
src/server/scripts/Northrend/isle_of_conquest.cpp
src/server/shared/Database/Implementation/LoginDatabase.cpp
src/server/shared/Database/Implementation/LoginDatabase.h
Diffstat (limited to 'src/server/game/Spells/Spell.h')
| -rw-r--r-- | src/server/game/Spells/Spell.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 9fc3deaef99..65fe51b37e3 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -109,6 +109,9 @@ class SpellCastTargets void SetTargetFlag(SpellCastTargetFlags flag) { m_targetMask |= flag; } + ObjectGuid GetOrigUnitTargetGUID() const; + void SetOrigUnitTarget(Unit* target); + ObjectGuid GetUnitTargetGUID() const; Unit* GetUnitTarget() const; void SetUnitTarget(Unit* target); @@ -174,6 +177,7 @@ class SpellCastTargets Item* m_itemTarget; // object GUID/etc, can be used always + ObjectGuid m_origObjectTargetGUID; ObjectGuid m_objectTargetGUID; ObjectGuid m_itemTargetGUID; uint32 m_itemTargetEntry; |