mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10402] Use ObjectGuid in packets and fix some uint32 guids cases.

Browse source
This commit is contained in:
VladimirMangos 2010-08-23 12:28:06 +04:00
parent c545392f2e
commit 09b03b470e
24 changed files with 77 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/game/SpellEffects.cpp
View file

@ -904,7 +904,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
if (caster && caster->GetTypeId() == TYPEID_PLAYER)
{
WorldPacket data(SMSG_SPIRIT_HEALER_CONFIRM, 8);
data << uint64(unitTarget->GetGUID());
data << unitTarget->GetObjectGuid();
((Player*)caster)->GetSession()->SendPacket( &data );
}
return;
@ -4214,8 +4214,8 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx)
{
// Failed to dispell
WorldPacket data(SMSG_DISPEL_FAILED, 8+8+4+4*fail_list.size());
data << uint64(m_caster->GetGUID()); // Caster GUID
data << uint64(unitTarget->GetGUID()); // Victim GUID
data << m_caster->GetObjectGuid(); // Caster GUID
data << unitTarget->GetObjectGuid(); // Victim GUID
data << uint32(m_spellInfo->Id); // Dispell spell id
for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j)
data << uint32(*j); // Spell Id
@ -6686,8 +6686,8 @@ void Spell::EffectDuel(SpellEffectIndex eff_idx)
// Send request
WorldPacket data(SMSG_DUEL_REQUESTED, 8 + 8);
data << uint64(pGameObj->GetGUID());
data << uint64(caster->GetGUID());
data << pGameObj->GetObjectGuid();
data << caster->GetObjectGuid();
caster->GetSession()->SendPacket(&data);
target->GetSession()->SendPacket(&data);
@ -6752,7 +6752,7 @@ void Spell::EffectSummonPlayer(SpellEffectIndex /*eff_idx*/)
((Player*)unitTarget)->SetSummonPoint(m_caster->GetMapId(),x,y,z);
WorldPacket data(SMSG_SUMMON_REQUEST, 8+4+4);
data << uint64(m_caster->GetGUID()); // summoner guid
data << m_caster->GetObjectGuid(); // summoner guid
data << uint32(m_caster->GetZoneId()); // summoner zone
data << uint32(MAX_PLAYER_SUMMON_DELAY*IN_MILLISECONDS); // auto decline after msecs
((Player*)unitTarget)->GetSession()->SendPacket(&data);
@ -6883,7 +6883,7 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc)
{
WorldPacket data(SMSG_TOTEM_CREATED, 1 + 8 + 4 + 4);
data << uint8(slot);
data << uint64(pTotem->GetGUID());
data << pTotem->GetObjectGuid();
data << uint32(duration);
data << uint32(m_spellInfo->Id);
((Player*)m_caster)->SendDirectMessage(&data);
@ -7985,7 +7985,7 @@ void Spell::EffectBind(SpellEffectIndex eff_idx)
// zone update
data.Initialize(SMSG_PLAYERBOUND, 8+4);
data << uint64(player->GetGUID());
data << player->GetObjectGuid();
data << uint32(area_id);
player->SendDirectMessage( &data );
}
@ -8031,7 +8031,7 @@ void Spell::EffectTeachTaxiNode( SpellEffectIndex eff_idx )
player->SendDirectMessage( &data );
data.Initialize( SMSG_TAXINODE_STATUS, 9 );
data << uint64( m_caster->GetGUID() );
data << m_caster->GetObjectGuid();
data << uint8( 1 );
player->SendDirectMessage( &data );
}