From c5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 18 May 2017 23:52:58 +0200 Subject: Core/Game: Include cleanup * Mostly aimed at removing Log/DatabaseEnv includes from other headers * Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files * Moved SAI function definitions to source files (massive or requiring many different dependencies) --- src/server/game/Guilds/GuildFinderMgr.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/server/game/Guilds/GuildFinderMgr.cpp') diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index 8182bc848dd..c057324e2c5 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -15,12 +15,24 @@ * with this program. If not, see . */ -#include "ObjectMgr.h" #include "GuildFinderMgr.h" +#include "DatabaseEnv.h" +#include "Guild.h" #include "GuildMgr.h" #include "GuildFinderPackets.h" +#include "Log.h" +#include "ObjectMgr.h" #include "World.h" +MembershipRequest::MembershipRequest() : _availability(0), _classRoles(0), _interests(0), _time(time(NULL)) +{ +} + +MembershipRequest::MembershipRequest(ObjectGuid const& playerGUID, ObjectGuid const& guildId, uint32 availability, uint32 classRoles, uint32 interests, std::string comment, time_t submitTime) : + _comment(std::move(comment)), _guildId(guildId), _playerGUID(playerGUID), _availability(availability), _classRoles(classRoles), _interests(interests), _time(submitTime) +{ +} + GuildFinderMgr::GuildFinderMgr() { } @@ -102,7 +114,7 @@ void GuildFinderMgr::LoadMembershipRequests() std::string comment = fields[5].GetString(); uint32 submitTime = fields[6].GetUInt32(); - MembershipRequest request(playerId, guildId, availability, classRoles, interests, comment, time_t(submitTime)); + MembershipRequest request(playerId, guildId, availability, classRoles, interests, std::move(comment), time_t(submitTime)); _membershipRequestsByGuild[guildId][playerId] = request; _membershipRequestsByPlayer[playerId][guildId] = request; -- cgit v1.2.3