Just a few renames.

This commit is contained in:
tomrus88 2009-05-09 16:01:31 +04:00
parent b5548f9f12
commit 5e26a2a152
22 changed files with 318 additions and 313 deletions

View file

@ -140,9 +140,9 @@ static void AttemptAddMore(Player* _player)
}
}
void WorldSession::HandleLfgAutoJoinOpcode( WorldPacket & /*recv_data*/ )
void WorldSession::HandleLfgSetAutoJoinOpcode( WorldPacket & /*recv_data*/ )
{
sLog.outDebug("CMSG_SET_LFG_AUTO_JOIN");
sLog.outDebug("CMSG_LFG_SET_AUTOJOIN");
LookingForGroup_auto_join = true;
if(!_player) // needed because STATUS_AUTHED
@ -151,15 +151,15 @@ void WorldSession::HandleLfgAutoJoinOpcode( WorldPacket & /*recv_data*/ )
AttemptJoin(_player);
}
void WorldSession::HandleLfgCancelAutoJoinOpcode( WorldPacket & /*recv_data*/ )
void WorldSession::HandleLfgClearAutoJoinOpcode( WorldPacket & /*recv_data*/ )
{
sLog.outDebug("CMSG_UNSET_LFG_AUTO_JOIN");
sLog.outDebug("CMSG_LFG_CLEAR_AUTOJOIN");
LookingForGroup_auto_join = false;
}
void WorldSession::HandleLfmAutoAddMembersOpcode( WorldPacket & /*recv_data*/ )
void WorldSession::HandleLfmSetAutoFillOpcode( WorldPacket & /*recv_data*/ )
{
sLog.outDebug("CMSG_SET_LFM_AUTOADD");
sLog.outDebug("CMSG_LFM_SET_AUTOFILL");
LookingForGroup_auto_add = true;
if(!_player) // needed because STATUS_AUTHED
@ -168,15 +168,16 @@ void WorldSession::HandleLfmAutoAddMembersOpcode( WorldPacket & /*recv_data*/ )
AttemptAddMore(_player);
}
void WorldSession::HandleLfmCancelAutoAddmembersOpcode( WorldPacket & /*recv_data*/ )
void WorldSession::HandleLfmClearAutoFillOpcode( WorldPacket & /*recv_data*/ )
{
sLog.outDebug("CMSG_UNSET_LFM_AUTOADD");
sLog.outDebug("CMSG_LFM_CLEAR_AUTOFILL");
LookingForGroup_auto_add = false;
}
void WorldSession::HandleLfgClearOpcode( WorldPacket & /*recv_data */ )
{
sLog.outDebug("CMSG_LOOKING_FOR_GROUP_CLEAR");
// empty packet
sLog.outDebug("CMSG_CLEAR_LOOKING_FOR_GROUP");
for(int i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i)
_player->m_lookingForGroup.slots[i].Clear();
@ -185,25 +186,28 @@ void WorldSession::HandleLfgClearOpcode( WorldPacket & /*recv_data */ )
_player->LeaveLFGChannel();
}
void WorldSession::HandleLfmSetNoneOpcode( WorldPacket & /*recv_data */)
void WorldSession::HandleLfmClearOpcode( WorldPacket & /*recv_data */)
{
sLog.outDebug("CMSG_SET_LOOKING_FOR_NONE");
// empty packet
sLog.outDebug("CMSG_CLEAR_LOOKING_FOR_MORE");
_player->m_lookingForGroup.more.Clear();
}
void WorldSession::HandleLfmSetOpcode( WorldPacket & recv_data )
void WorldSession::HandleSetLfmOpcode( WorldPacket & recv_data )
{
CHECK_PACKET_SIZE(recv_data,4);
CHECK_PACKET_SIZE(recv_data, 4+1+1+1+1);
sLog.outDebug("CMSG_SET_LOOKING_FOR_MORE");
//recv_data.hexlike();
uint32 temp, entry, type;
uint8 unk1;
uint8 unk2[3];
recv_data >> temp;
recv_data >> temp >> unk1 >> unk2[0] >> unk2[1] >> unk2[2];
entry = ( temp & 0xFFFF);
type = ( (temp >> 24) & 0xFFFF);
entry = ( temp & 0x00FFFFFF);
type = ( (temp >> 24) & 0x000000FF);
_player->m_lookingForGroup.more.Set(entry,type);
sLog.outDebug("LFM set: temp %u, zone %u, type %u", temp, entry, type);
@ -214,11 +218,11 @@ void WorldSession::HandleLfmSetOpcode( WorldPacket & recv_data )
SendLfgResult(type, entry, 1);
}
void WorldSession::HandleLfgSetCommentOpcode( WorldPacket & recv_data )
void WorldSession::HandleSetLfgCommentOpcode( WorldPacket & recv_data )
{
CHECK_PACKET_SIZE(recv_data,1);
sLog.outDebug("CMSG_SET_COMMENTARY");
sLog.outDebug("CMSG_SET_LFG_COMMENT");
//recv_data.hexlike();
std::string comment;
@ -230,7 +234,7 @@ void WorldSession::HandleLfgSetCommentOpcode( WorldPacket & recv_data )
void WorldSession::HandleLookingForGroup(WorldPacket& recv_data)
{
CHECK_PACKET_SIZE(recv_data,4+4+4);
CHECK_PACKET_SIZE(recv_data, 4+4+4);
sLog.outDebug("MSG_LOOKING_FOR_GROUP");
//recv_data.hexlike();
@ -313,21 +317,23 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
void WorldSession::HandleSetLfgOpcode( WorldPacket & recv_data )
{
CHECK_PACKET_SIZE(recv_data,4+4);
CHECK_PACKET_SIZE(recv_data, 4+4+1+1);
sLog.outDebug("CMSG_SET_LOOKING_FOR_GROUP");
//recv_data.hexlike();
recv_data.hexlike();
uint32 slot, temp, entry, type;
uint8 roles, unk1;
recv_data >> slot >> temp;
recv_data >> slot >> temp >> roles >> unk1;
entry = ( temp & 0xFFFF);
type = ( (temp >> 24) & 0xFFFF);
entry = ( temp & 0x00FFFFFF);
type = ( (temp >> 24) & 0x000000FF);
if(slot >= MAX_LOOKING_FOR_GROUP_SLOT)
return;
_player->m_lookingForGroup.slots[slot].Set(entry,type);
_player->m_lookingForGroup.slots[slot].Set(entry, type);
_player->m_lookingForGroup.roles = roles;
sLog.outDebug("LFG set: looknumber %u, temp %X, type %u, entry %u", slot, temp, type, entry);
if(LookingForGroup_auto_join)