Yet more cleanup, mostly in the script system. This should conclude the script integration into core.

--HG--
branch : trunk
This commit is contained in:
Xanadu committed 2010-02-05 13:01:32 +01:00
1 parent a5d1bc77ab
commit f8d1920fa5
34 files changed
+18 -335

No files matched your search

-32
View File
@@ -206,38 +206,6 @@ void AuraApplication::ClientUpdate(bool remove)
m_target->SendMessageToSet(&data, true);
}
void AuraApplication::ConstructAuraInfo(ByteBuffer &data)
{
m_needClientUpdate = false;
data << uint8(m_slot);
if(!m_target->GetVisibleAura(m_slot))
{
data << uint32(0);
sLog.outDebug("Aura %u removed slot %u",GetBase()->GetId(), m_slot);
return;
}
Aura const * aura = GetBase();
data << uint32(aura->GetId());
uint32 flags = m_flags;
if (aura->GetMaxDuration() > 0)
flags |= AFLAG_DURATION;
data << uint8(flags);
data << uint8(aura->GetCasterLevel());
data << uint8(aura->GetStackAmount() > 1 ? aura->GetStackAmount() : (aura->GetCharges()) ? aura->GetCharges() : 1);
if(!(flags & AFLAG_CASTER))
data.appendPackGUID(aura->GetCasterGUID());
if(flags & AFLAG_DURATION)
{
data << uint32(aura->GetMaxDuration());
data << uint32(aura->GetDuration());
}
}
Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID)
{
assert(spellproto);