[9551] Add and use PackedGuid wrapper.

Also
* use more wide bytebuff << >> operators for objects
* use at read packet faisl alsways exception way instead some time used bool results.
This commit is contained in:
VladimirMangos 2010-03-08 20:19:25 +03:00
parent ad9243ebd0
commit c8fd454a79
26 changed files with 351 additions and 340 deletions

View file

@ -4134,7 +4134,7 @@ void Player::SetMovement(PlayerMovementType pType)
sLog.outError("Player::SetMovement: Unsupported move type (%d), data not sent to client.",pType);
return;
}
data.append(GetPackGUID());
data << GetPackGUID();
data << uint32(0);
GetSession()->SendPacket( &data );
}
@ -4146,7 +4146,7 @@ void Player::SetMovement(PlayerMovementType pType)
void Player::BuildPlayerRepop()
{
WorldPacket data(SMSG_PRE_RESURRECT, GetPackGUID().size());
data.append(GetPackGUID());
data << GetPackGUID();
GetSession()->SendPacket(&data);
if(getRace() == RACE_NIGHTELF)
@ -16961,7 +16961,7 @@ void Player::SendAttackSwingBadFacingAttack()
void Player::SendAutoRepeatCancel(Unit *target)
{
WorldPacket data(SMSG_CANCEL_AUTO_REPEAT, target->GetPackGUID().size());
data.append(target->GetPackGUID()); // may be it's target guid
data << target->GetPackGUID(); // may be it's target guid
GetSession()->SendPacket( &data );
}
@ -18936,7 +18936,7 @@ void Player::SendComboPoints()
if (combotarget)
{
WorldPacket data(SMSG_UPDATE_COMBO_POINTS, combotarget->GetPackGUID().size()+1);
data.append(combotarget->GetPackGUID());
data << combotarget->GetPackGUID();
data << uint8(m_comboPoints);
GetSession()->SendPacket(&data);
}
@ -19096,7 +19096,7 @@ void Player::SendInitialPacketsAfterAddToMap()
if(HasAuraType(SPELL_AURA_MOD_ROOT))
{
WorldPacket data2(SMSG_FORCE_MOVE_ROOT, 10);
data2.append(GetPackGUID());
data2 << GetPackGUID();
data2 << (uint32)2;
SendMessageToSet(&data2,true);
}
@ -19340,7 +19340,7 @@ void Player::SendAurasForTarget(Unit *target)
return;
WorldPacket data(SMSG_AURA_UPDATE_ALL);
data.append(target->GetPackGUID());
data << target->GetPackGUID();
Unit::VisibleAuraMap const *visibleAuras = target->GetVisibleAuras();
for(Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr)
@ -19983,7 +19983,7 @@ void Player::ResurectUsingRequestData()
void Player::SetClientControl(Unit* target, uint8 allowMove)
{
WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, target->GetPackGUID().size()+1);
data.append(target->GetPackGUID());
data << target->GetPackGUID();
data << uint8(allowMove);
GetSession()->SendPacket(&data);
}
@ -20379,7 +20379,7 @@ void Player::EnterVehicle(Vehicle *vehicle)
GetSession()->SendPacket(&data);
data.Initialize(MSG_MOVE_TELEPORT_ACK, 30);
data.append(GetPackGUID());
data << GetPackGUID();
data << uint32(0); // counter?
data << uint32(MOVEFLAG_ONTRANSPORT); // transport
data << uint16(0); // special flags
@ -20428,7 +20428,7 @@ void Player::ExitVehicle(Vehicle *vehicle)
SetMover(NULL);
WorldPacket data(MSG_MOVE_TELEPORT_ACK, 30);
data.append(GetPackGUID());
data << GetPackGUID();
data << uint32(0); // counter?
data << uint32(MOVEFLAG_ROOT); // fly unk
data << uint16(MOVEFLAG2_UNK4); // special flags
@ -21586,7 +21586,7 @@ void Player::SendClearCooldown( uint32 spell_id, Unit* target )
void Player::BuildTeleportAckMsg( WorldPacket *data, float x, float y, float z, float ang ) const
{
data->Initialize(MSG_MOVE_TELEPORT_ACK, 41);
data->append(GetPackGUID());
*data << GetPackGUID();
*data << uint32(0); // this value increments every time
*data << uint32(m_movementInfo.GetMovementFlags()); // movement flags
*data << uint16(0); // 2.3.0