From 28f2a91b21d77070fd54e24f830f69fac59e3be4 Mon Sep 17 00:00:00 2001 From: Maru Date: Thu, 7 Dec 2017 17:50:54 -0200 Subject: [PATCH] Please compile --- .../Server_Zone/Actor/Social/FriendList.cpp | 1 + src/servers/Server_Zone/Actor/Social/FriendList.h | 14 ++++---------- src/servers/Server_Zone/Actor/Social/Group.h | 7 ++++--- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/servers/Server_Zone/Actor/Social/FriendList.cpp b/src/servers/Server_Zone/Actor/Social/FriendList.cpp index 37f89bf4..6f8e4463 100644 --- a/src/servers/Server_Zone/Actor/Social/FriendList.cpp +++ b/src/servers/Server_Zone/Actor/Social/FriendList.cpp @@ -10,6 +10,7 @@ #include #include #include "FriendList.h" +#include "Group.h" extern Core::ServerZone g_serverZone; extern Core::Logger g_log; diff --git a/src/servers/Server_Zone/Actor/Social/FriendList.h b/src/servers/Server_Zone/Actor/Social/FriendList.h index bc9503d2..bc535758 100644 --- a/src/servers/Server_Zone/Actor/Social/FriendList.h +++ b/src/servers/Server_Zone/Actor/Social/FriendList.h @@ -32,23 +32,17 @@ public: ~FriendList() {}; - virtual Core::Network::Packets::GamePacketPtr addMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); - virtual Core::Network::Packets::GamePacketPtr inviteMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); - virtual Core::Network::Packets::GamePacketPtr removeMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); - virtual Core::Network::Packets::GamePacketPtr kickMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); - virtual void sendPacketToMembers( Core::Network::Packets::GamePacketPtr pPacket, bool invitesToo = false ); - - virtual void load(); + /*virtual void load(); virtual void update(); - virtual void disband(); + virtual void disband();*/ bool isParty() const; bool isFriendList() const; bool isFreeCompany() const; bool isLinkshell() const; bool isFreeCompanyPetition() const; - bool isBlacklist() const; - bool isContentGroup() const; + /*bool isBlacklist() const; + bool isContentGroup() const;*/ std::vector< Core::Network::Packets::Server::PlayerEntry > getFriendListEntries( uint16_t entryAmount ); diff --git a/src/servers/Server_Zone/Actor/Social/Group.h b/src/servers/Server_Zone/Actor/Social/Group.h index e17624ba..a315d19c 100644 --- a/src/servers/Server_Zone/Actor/Social/Group.h +++ b/src/servers/Server_Zone/Actor/Social/Group.h @@ -53,9 +53,10 @@ public: bool isContentGroup() const; virtual Core::Network::Packets::GamePacketPtr addMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); + /* virtual Core::Network::Packets::GamePacketPtr inviteMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); virtual Core::Network::Packets::GamePacketPtr removeMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); - virtual Core::Network::Packets::GamePacketPtr kickMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); + virtual Core::Network::Packets::GamePacketPtr kickMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 );*/ virtual void sendPacketToMembers( Core::Network::Packets::GamePacketPtr pPacket, bool invitesToo = false ); /*! generates a player entry used for lists (social, etc) */ @@ -81,9 +82,9 @@ private: - virtual void load(); + /*virtual void load(); virtual void update(); - virtual void disband(); + virtual void disband();*/ };