aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Entities/Object/Object.cpp54
-rw-r--r--src/server/game/Entities/Object/Object.h7
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp54
-rw-r--r--src/server/game/Entities/Unit/Unit.h7
4 files changed, 61 insertions, 61 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index a5deb3883bc..2efe7896333 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -2866,42 +2866,6 @@ SpellCastResult WorldObject::CastSpell(CastSpellTargetArg const& targets, uint32
return spell->prepare(*targets.Targets, args.TriggeringAura);
}
-void WorldObject::SendPlaySpellVisual(WorldObject* target, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime /*= false*/)
-{
- WorldPackets::Spells::PlaySpellVisual playSpellVisual;
- playSpellVisual.Source = GetGUID();
- playSpellVisual.Target = target->GetGUID();
- playSpellVisual.TargetPosition = target->GetPosition();
- playSpellVisual.SpellVisualID = spellVisualId;
- playSpellVisual.TravelSpeed = travelSpeed;
- playSpellVisual.MissReason = missReason;
- playSpellVisual.ReflectStatus = reflectStatus;
- playSpellVisual.SpeedAsTime = speedAsTime;
- SendMessageToSet(playSpellVisual.Write(), true);
-}
-
-void WorldObject::SendPlaySpellVisual(Position const& targetPosition, float launchDelay, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime /*= false*/)
-{
- WorldPackets::Spells::PlaySpellVisual playSpellVisual;
- playSpellVisual.Source = GetGUID();
- playSpellVisual.TargetPosition = targetPosition;
- playSpellVisual.LaunchDelay = launchDelay;
- playSpellVisual.SpellVisualID = spellVisualId;
- playSpellVisual.TravelSpeed = travelSpeed;
- playSpellVisual.MissReason = missReason;
- playSpellVisual.ReflectStatus = reflectStatus;
- playSpellVisual.SpeedAsTime = speedAsTime;
- SendMessageToSet(playSpellVisual.Write(), true);
-}
-
-void WorldObject::SendCancelSpellVisual(uint32 id)
-{
- WorldPackets::Spells::CancelSpellVisual cancelSpellVisual;
- cancelSpellVisual.Source = GetGUID();
- cancelSpellVisual.SpellVisualID = id;
- SendMessageToSet(cancelSpellVisual.Write(), true);
-}
-
void WorldObject::SendPlayOrphanSpellVisual(ObjectGuid const& target, uint32 spellVisualId, float travelSpeed, bool speedAsTime /*= false*/, bool withSourceOrientation /*= false*/)
{
WorldPackets::Spells::PlayOrphanSpellVisual playOrphanSpellVisual;
@@ -2959,24 +2923,6 @@ void WorldObject::SendCancelOrphanSpellVisual(uint32 id)
SendMessageToSet(cancelOrphanSpellVisual.Write(), true);
}
-void WorldObject::SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const
-{
- WorldPackets::Spells::PlaySpellVisualKit playSpellVisualKit;
- playSpellVisualKit.Unit = GetGUID();
- playSpellVisualKit.KitRecID = id;
- playSpellVisualKit.KitType = type;
- playSpellVisualKit.Duration = duration;
- SendMessageToSet(playSpellVisualKit.Write(), true);
-}
-
-void WorldObject::SendCancelSpellVisualKit(uint32 id)
-{
- WorldPackets::Spells::CancelSpellVisualKit cancelSpellVisualKit;
- cancelSpellVisualKit.Source = GetGUID();
- cancelSpellVisualKit.SpellVisualKitID = id;
- SendMessageToSet(cancelSpellVisualKit.Write(), true);
-}
-
// function based on function Unit::CanAttack from 13850 client
bool WorldObject::IsValidAttackTarget(WorldObject const* target, SpellInfo const* bySpell /*= nullptr*/) const
{
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index db0f64db245..ddad2bc5574 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -681,13 +681,6 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
void SendPlayOrphanSpellVisual(Position const& targetLocation, uint32 spellVisualId, float travelSpeed, bool speedAsTime = false, bool withSourceOrientation = false);
void SendCancelOrphanSpellVisual(uint32 id);
- void SendPlaySpellVisual(WorldObject* target, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime = false);
- void SendPlaySpellVisual(Position const& targetPosition, float o, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime = false);
- void SendCancelSpellVisual(uint32 id);
-
- void SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const;
- void SendCancelSpellVisualKit(uint32 id);
-
bool IsValidAttackTarget(WorldObject const* target, SpellInfo const* bySpell = nullptr) const;
bool IsValidAssistTarget(WorldObject const* target, SpellInfo const* bySpell = nullptr) const;
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index cb2d7b0c8df..d7c3daf2651 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11667,6 +11667,60 @@ void Unit::SetAuraStack(uint32 spellId, Unit* target, uint32 stack)
aura->SetStackAmount(stack);
}
+void Unit::SendPlaySpellVisual(Unit* target, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime /*= false*/)
+{
+ WorldPackets::Spells::PlaySpellVisual playSpellVisual;
+ playSpellVisual.Source = GetGUID();
+ playSpellVisual.Target = target->GetGUID();
+ playSpellVisual.TargetPosition = target->GetPosition();
+ playSpellVisual.SpellVisualID = spellVisualId;
+ playSpellVisual.TravelSpeed = travelSpeed;
+ playSpellVisual.MissReason = missReason;
+ playSpellVisual.ReflectStatus = reflectStatus;
+ playSpellVisual.SpeedAsTime = speedAsTime;
+ SendMessageToSet(playSpellVisual.Write(), true);
+}
+
+void Unit::SendCancelSpellVisual(uint32 id)
+{
+ WorldPackets::Spells::CancelSpellVisual cancelSpellVisual;
+ cancelSpellVisual.Source = GetGUID();
+ cancelSpellVisual.SpellVisualID = id;
+ SendMessageToSet(cancelSpellVisual.Write(), true);
+}
+
+void Unit::SendPlaySpellVisual(Position const& targetPosition, float launchDelay, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime /*= false*/)
+{
+ WorldPackets::Spells::PlaySpellVisual playSpellVisual;
+ playSpellVisual.Source = GetGUID();
+ playSpellVisual.TargetPosition = targetPosition;
+ playSpellVisual.LaunchDelay = launchDelay;
+ playSpellVisual.SpellVisualID = spellVisualId;
+ playSpellVisual.TravelSpeed = travelSpeed;
+ playSpellVisual.MissReason = missReason;
+ playSpellVisual.ReflectStatus = reflectStatus;
+ playSpellVisual.SpeedAsTime = speedAsTime;
+ SendMessageToSet(playSpellVisual.Write(), true);
+}
+
+void Unit::SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const
+{
+ WorldPackets::Spells::PlaySpellVisualKit playSpellVisualKit;
+ playSpellVisualKit.Unit = GetGUID();
+ playSpellVisualKit.KitRecID = id;
+ playSpellVisualKit.KitType = type;
+ playSpellVisualKit.Duration = duration;
+ SendMessageToSet(playSpellVisualKit.Write(), true);
+}
+
+void Unit::SendCancelSpellVisualKit(uint32 id)
+{
+ WorldPackets::Spells::CancelSpellVisualKit cancelSpellVisualKit;
+ cancelSpellVisualKit.Source = GetGUID();
+ cancelSpellVisualKit.SpellVisualKitID = id;
+ SendMessageToSet(cancelSpellVisualKit.Write(), true);
+}
+
void Unit::CancelSpellMissiles(uint32 spellId, bool reverseMissile /*= false*/)
{
bool hasMissile = false;
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 7297f65bb1a..e02adf73e19 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1183,6 +1183,13 @@ class TC_GAME_API Unit : public WorldObject
Aura* AddAura(SpellInfo const* spellInfo, uint32 effMask, Unit* target);
void SetAuraStack(uint32 spellId, Unit* target, uint32 stack);
+ void SendPlaySpellVisual(Unit* target, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime = false);
+ void SendPlaySpellVisual(Position const& targetPosition, float o, uint32 spellVisualId, uint16 missReason, uint16 reflectStatus, float travelSpeed, bool speedAsTime = false);
+ void SendCancelSpellVisual(uint32 id);
+
+ void SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const;
+ void SendCancelSpellVisualKit(uint32 id);
+
void CancelSpellMissiles(uint32 spellId, bool reverseMissile = false);
void DeMorph();