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

Partly fixed MSG_LOOKING_FOR_GROUP opcode.

Browse source
This commit is contained in:
tomrus88 2009-05-10 00:46:11 +04:00
parent ef7656a554
commit 0db4ccc692
4 changed files with 113 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/CharacterHandler.cpp
View file

@ -885,9 +885,7 @@ void WorldSession::HandleMeetingStoneInfo( WorldPacket & /*recv_data*/ )
{ {
DEBUG_LOG( "WORLD: Received CMSG_MEETING_STONE_INFO" ); DEBUG_LOG( "WORLD: Received CMSG_MEETING_STONE_INFO" );
WorldPacket data(SMSG_MEETINGSTONE_SETQUEUE, 5); SendLfgUpdate(0, 0, 0);
data << uint32(0) << uint8(6);
SendPacket(&data);
} }
void WorldSession::HandleTutorialFlag( WorldPacket & recv_data ) void WorldSession::HandleTutorialFlag( WorldPacket & recv_data )

140
src/game/LFGHandler.cpp
View file

@ -184,6 +184,8 @@ void WorldSession::HandleLfgClearOpcode( WorldPacket & /*recv_data */ )
if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER ) if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER )
_player->LeaveLFGChannel(); _player->LeaveLFGChannel();
SendLfgUpdate(0, 0, 0);
} }
void WorldSession::HandleLfmClearOpcode( WorldPacket & /*recv_data */) void WorldSession::HandleLfmClearOpcode( WorldPacket & /*recv_data */)
@ -220,7 +222,7 @@ void WorldSession::HandleSetLfmOpcode( WorldPacket & recv_data )
void WorldSession::HandleSetLfgCommentOpcode( WorldPacket & recv_data ) void WorldSession::HandleSetLfgCommentOpcode( WorldPacket & recv_data )
{ {
CHECK_PACKET_SIZE(recv_data,1); CHECK_PACKET_SIZE(recv_data, 1);
sLog.outDebug("CMSG_SET_LFG_COMMENT"); sLog.outDebug("CMSG_SET_LFG_COMMENT");
//recv_data.hexlike(); //recv_data.hexlike();
@ -250,18 +252,53 @@ void WorldSession::HandleLookingForGroup(WorldPacket& recv_data)
AttemptJoin(_player); AttemptJoin(_player);
SendLfgResult(type, entry, 0); SendLfgResult(type, entry, 0);
SendLfgUpdate(0, 1, 0);
} }
void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
{ {
uint32 number = 0; uint32 number = 0;
// start prepare packet;
WorldPacket data(MSG_LOOKING_FOR_GROUP); WorldPacket data(MSG_LOOKING_FOR_GROUP);
data << uint32(type); // type data << uint32(type); // type
data << uint32(entry); // entry from LFGDungeons.dbc data << uint32(entry); // entry from LFGDungeons.dbc
data << uint32(0); // count, placeholder
data << uint32(0); // count again, strange, placeholder data << uint8(0);
/*if(uint8)
{
uint32 count1;
for(count1)
{
uint64; // player guid
}
}*/
data << uint32(0); // count2
data << uint32(0);
/*for(count2)
{
uint64 // not player guid
uint32 flags;
if(flags & 0x2)
{
string
}
if(flags & 0x10)
{
uint8
}
if(flags & 0x20)
{
for(3)
{
uint8
}
}
}*/
size_t count3_pos = data.wpos();
data << uint32(0); // count3
data << uint32(0); // unk
//TODO: Guard Player map //TODO: Guard Player map
HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers(); HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers();
@ -272,45 +309,78 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
if(!plr || plr->GetTeam() != _player->GetTeam()) if(!plr || plr->GetTeam() != _player->GetTeam())
continue; continue;
if(!plr->m_lookingForGroup.HaveInSlot(entry,type)) if(!plr->m_lookingForGroup.HaveInSlot(entry, type))
continue; continue;
++number; ++number;
data.append(plr->GetPackGUID()); // packed guid data << uint64(plr->GetGUID()); // guid
data << plr->getLevel(); // level
data << plr->GetZoneId(); // current zone
data << lfg_type; // 0x00 - LFG, 0x01 - LFM
for(uint8 j = 0; j < MAX_LOOKING_FOR_GROUP_SLOT; ++j) uint32 flags = 0x1FF;
data << uint32(flags); // flags
if(flags & 0x1)
{ {
data << uint32( plr->m_lookingForGroup.slots[j].entry | (plr->m_lookingForGroup.slots[j].type << 24) ); data << uint8(plr->getLevel());
data << uint8(plr->getClass());
data << uint8(plr->getRace());
for(int i = 0; i < 3; ++i)
data << uint8(0); // spent talents count in specific tab
data << uint32(0); // resistances1
data << uint32(0); // spd/heal
data << uint32(0); // spd/heal
data << uint32(0); // combat_rating9
data << uint32(0); // combat_rating10
data << uint32(0); // combat_rating11
data << float(0); // mp5
data << float(0); // unk
data << uint32(0); // attack power
data << uint32(0); // stat1
data << uint32(0); // maxhealth
data << uint32(0); // maxpower1
data << uint32(0); // unk
data << float(0); // unk
data << uint32(0); // unk
data << uint32(0); // unk
data << uint32(0); // unk
data << uint32(0); // unk
data << uint32(0); // combat_rating20
data << uint32(0); // unk
} }
data << plr->m_lookingForGroup.comment;
Group *group = plr->GetGroup(); if(flags & 0x2)
if(group) data << plr->m_lookingForGroup.comment; // comment
if(flags & 0x4)
data << uint8(0); // unk
if(flags & 0x8)
data << uint64(0); // guid from count2 block, not player guid
if(flags & 0x10)
data << uint8(0); // unk
if(flags & 0x20)
data << uint8(plr->m_lookingForGroup.roles); // roles
if(flags & 0x40)
data << uint32(plr->GetZoneId()); // areaid
if(flags & 0x100)
data << uint8(0); // unk
if(flags & 0x80)
{ {
data << group->GetMembersCount()-1; // count of group members without group leader for(uint8 j = 0; j < MAX_LOOKING_FOR_GROUP_SLOT; ++j)
for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
{ {
Player *member = itr->getSource(); data << uint32(plr->m_lookingForGroup.slots[j].entry | (plr->m_lookingForGroup.slots[j].type << 24));
if(member && member->GetGUID() != plr->GetGUID())
{
data.append(member->GetPackGUID()); // packed guid
data << member->getLevel(); // player level
}
} }
} }
else
{
data << uint32(0x00);
}
} }
// fill count placeholders data.put<uint32>(count3_pos, number); // fill count placeholder
data.put<uint32>(4+4, number);
data.put<uint32>(4+4+4,number);
SendPacket(&data); SendPacket(&data);
} }
@ -339,7 +409,8 @@ void WorldSession::HandleSetLfgOpcode( WorldPacket & recv_data )
if(LookingForGroup_auto_join) if(LookingForGroup_auto_join)
AttemptJoin(_player); AttemptJoin(_player);
SendLfgResult(type, entry, 0); //SendLfgResult(type, entry, 0);
SendLfgUpdate(0, 1, 0);
} }
void WorldSession::HandleLfgSetRoles(WorldPacket &recv_data) void WorldSession::HandleLfgSetRoles(WorldPacket &recv_data)
@ -353,3 +424,12 @@ void WorldSession::HandleLfgSetRoles(WorldPacket &recv_data)
_player->m_lookingForGroup.roles = roles; _player->m_lookingForGroup.roles = roles;
} }
void WorldSession::SendLfgUpdate(uint8 unk1, uint8 unk2, uint8 unk3)
{
WorldPacket data(SMSG_LFG_UPDATE, 3);
data << uint8(unk1);
data << uint8(unk2);
data << uint8(unk3);
SendPacket(&data);
}

2
src/game/Opcodes.h
View file

@ -693,7 +693,7 @@ enum Opcodes
CMSG_BUYBACK_ITEM = 0x290, CMSG_BUYBACK_ITEM = 0x290,
SMSG_SERVER_MESSAGE = 0x291, SMSG_SERVER_MESSAGE = 0x291,
CMSG_MEETINGSTONE_JOIN = 0x292, CMSG_MEETINGSTONE_JOIN = 0x292,
CMSG_MEETINGSTONE_LEAVE = 0x293, CMSG_MEETINGSTONE_LEAVE = 0x293, // SMSG?
CMSG_MEETINGSTONE_CHEAT = 0x294, CMSG_MEETINGSTONE_CHEAT = 0x294,
SMSG_MEETINGSTONE_SETQUEUE = 0x295, SMSG_MEETINGSTONE_SETQUEUE = 0x295,
CMSG_MEETINGSTONE_INFO = 0x296, CMSG_MEETINGSTONE_INFO = 0x296,

1
src/game/WorldSession.h
View file

@ -116,6 +116,7 @@ class MANGOS_DLL_SPEC WorldSession
void SendNotification(int32 string_id,...); void SendNotification(int32 string_id,...);
void SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName); void SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName);
void SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type); void SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type);
void SendLfgUpdate(uint8 unk1, uint8 unk2, uint8 unk3);
void SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res); void SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res);
void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2,3); void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2,3);
void SendSetPhaseShift(uint32 phaseShift); void SendSetPhaseShift(uint32 phaseShift);