mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 02:57:45 +00:00
Code Activity

Make it compile

Browse source
This commit is contained in:
Maru 2017-12-07 04:32:13 -02:00
parent cd3b2e1567
commit ef06686237
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/servers/Server_Zone/Actor/Group/FriendList.cpp
View file

@ -28,10 +28,12 @@ std::vector< PlayerEntry > Core::Entity::Group::FriendList::getFriendListEntries
entryList.push_back( generatePlayerEntry( member.second ) ); entryList.push_back( generatePlayerEntry( member.second ) );
limit++; limit++;
} }
return entryList;
} }
//todo: make this function generic for all groups, and override if needed? //todo: make this function generic for all groups, and override if needed?
ZoneChannelPacket< FFXIVIpcSocialList > Core::Entity::Group::FriendList::generateFriendsListPacket( PlayerPtr pPlayer ) Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > Core::Entity::Group::FriendList::generateFriendsListPacket( PlayerPtr pPlayer )
{ {
ZoneChannelPacket< FFXIVIpcSocialList > listPacket( pPlayer->getId() ); ZoneChannelPacket< FFXIVIpcSocialList > listPacket( pPlayer->getId() );
listPacket.data().type = 0x0B; listPacket.data().type = 0x0B;
@ -48,4 +50,6 @@ ZoneChannelPacket< FFXIVIpcSocialList > Core::Entity::Group::FriendList::generat
listPacket.data().entries[i] = generatePlayerEntry( member.second ); listPacket.data().entries[i] = generatePlayerEntry( member.second );
i++; i++;
} }
return listPacket;
} }

5
src/servers/Server_Zone/Actor/Group/FriendList.h
View file

@ -3,6 +3,7 @@
#include <src/servers/Server_Common/Common.h> #include <src/servers/Server_Common/Common.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h> #include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <Server_Common/Network/GamePacketNew.h>
#include <Server_Common/Forwards.h> #include <Server_Common/Forwards.h>
#include <Server_Zone/Actor/Group/Group.h> #include <Server_Zone/Actor/Group/Group.h>
#include <Server_Zone/Forwards.h> #include <Server_Zone/Forwards.h>
@ -49,9 +50,11 @@ public:
bool isBlacklist() const; bool isBlacklist() const;
bool isContentGroup() const; bool isContentGroup() const;
Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > generateFriendsListPacket( PlayerPtr pPlayer );
std::vector< Core::Network::Packets::Server::PlayerEntry > getFriendListEntries( uint16_t entryAmount ); std::vector< Core::Network::Packets::Server::PlayerEntry > getFriendListEntries( uint16_t entryAmount );
Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > generateFriendsListPacket( PlayerPtr pPlayer );
private: private:
GroupType m_type{ GroupType::FriendList }; GroupType m_type{ GroupType::FriendList };

2
src/servers/Server_Zone/Actor/Group/Group.cpp
View file

@ -18,7 +18,7 @@ using namespace Core::Entity::Group;
// todo: i fuckin have no fuckin clue how to use group manager classes, why not just have a map of <id, group>? // todo: i fuckin have no fuckin clue how to use group manager classes, why not just have a map of <id, group>?
// todo: invite map in g_serverZone.getGroupMgr(GroupType) and look up // todo: invite map in g_serverZone.getGroupMgr(GroupType) and look up
Core::Network::Packets::GamePacketPtr Group::addMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId ) Core::Network::Packets::GamePacketPtr Group::addMember( Core::Entity::PlayerPtr pSender, Core::Entity::PlayerPtr pRecipient, uint64_t senderId, uint64_t recipientId )
{ {
constexpr uint32_t logMessages[] = { constexpr uint32_t logMessages[] = {
0, // 0, //