From f395960adeea1f51f01ec8045d1e175926a6ea4a Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 15 May 2023 14:45:05 +0200 Subject: General code cleanups * Overall includes cleanup * Use std::make_pair * Make some functions const --- src/chat-server/guildhandler.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/chat-server/guildhandler.cpp') diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index b6870699..a47f8073 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -22,6 +22,7 @@ #include "chatchannel.h" #include "chatchannelmanager.h" #include "chatclient.h" +#include "common/defines.h" #include "guild.h" #include "guildmanager.h" @@ -54,12 +55,9 @@ void ChatHandler::sendGuildInvite(const std::string &invitedName, void ChatHandler::sendGuildRejoin(ChatClient &client) { // Get list of guilds and check what rights they have. - std::vector guilds = - guildManager->getGuildsForPlayer(client.characterId); + client.guilds = guildManager->getGuildsForPlayer(client.characterId); - client.guilds = guilds; - - for (auto guild : guilds) + for (auto guild : client.guilds) { const int permissions = guild->getUserPermissions(client.characterId); const std::string guildName = guild->getName(); -- cgit v1.2.3-60-g2f50