From 21df17fd47d08c3015c9db6434e3659b2591842b Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 25 Jul 2015 10:38:45 +0200 Subject: Core/Misc: Removed ReadAsPacked/WriteAsPacked methods from ObjectGuid, they are not needed anymore as guids are always written packed --- src/server/game/Spells/Spell.cpp | 53 ---------------------------------------- 1 file changed, 53 deletions(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b16d6893175..b52b5264d0a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -157,59 +157,6 @@ SpellCastTargets::SpellCastTargets(Unit* caster, WorldPackets::Spells::SpellCast SpellCastTargets::~SpellCastTargets() { } -void SpellCastTargets::Read(ByteBuffer& data, Unit* caster) -{ - data >> m_targetMask; - - if (m_targetMask == TARGET_FLAG_NONE) - return; - - if (m_targetMask & (TARGET_FLAG_UNIT | TARGET_FLAG_UNIT_MINIPET | TARGET_FLAG_GAMEOBJECT | TARGET_FLAG_CORPSE_ENEMY | TARGET_FLAG_CORPSE_ALLY)) - data >> m_objectTargetGUID.ReadAsPacked(); - - if (m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM)) - data >> m_itemTargetGUID.ReadAsPacked(); - - if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION) - { - data >> m_src._transportGUID.ReadAsPacked(); - if (!m_src._transportGUID.IsEmpty()) - data >> m_src._transportOffset.PositionXYZStream(); - else - data >> m_src._position.PositionXYZStream(); - } - else - { - m_src._transportGUID = caster->GetTransGUID(); - if (!m_src._transportGUID.IsEmpty()) - m_src._transportOffset.Relocate(caster->GetTransOffsetX(), caster->GetTransOffsetY(), caster->GetTransOffsetZ(), caster->GetTransOffsetO()); - else - m_src._position.Relocate(caster); - } - - if (m_targetMask & TARGET_FLAG_DEST_LOCATION) - { - data >> m_dst._transportGUID.ReadAsPacked(); - if (!m_dst._transportGUID.IsEmpty()) - data >> m_dst._transportOffset.PositionXYZStream(); - else - data >> m_dst._position.PositionXYZStream(); - } - else - { - m_dst._transportGUID = caster->GetTransGUID(); - if (!m_dst._transportGUID.IsEmpty()) - m_dst._transportOffset.Relocate(caster->GetTransOffsetX(), caster->GetTransOffsetY(), caster->GetTransOffsetZ(), caster->GetTransOffsetO()); - else - m_dst._position.Relocate(caster); - } - - if (m_targetMask & TARGET_FLAG_STRING) - data >> m_strTarget; - - Update(caster); -} - void SpellCastTargets::Write(WorldPackets::Spells::SpellTargetData& data) { data.Flags = m_targetMask; -- cgit v1.2.3