diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2023-05-15 14:45:05 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2023-05-15 14:45:05 +0200 |
| commit | f395960adeea1f51f01ec8045d1e175926a6ea4a (patch) | |
| tree | bf9d107fb5891c3e6bd0abeb4d49573c73230707 /src/chat-server/guildhandler.cpp | |
| parent | f3071beef3ddd93bbe3ab6e30c14fc95a5112b9c (diff) | |
| download | manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.tar.gz manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.tar.bz2 manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.tar.xz manaserv-f395960adeea1f51f01ec8045d1e175926a6ea4a.zip | |
General code cleanups
* Overall includes cleanup
* Use std::make_pair
* Make some functions const
Diffstat (limited to 'src/chat-server/guildhandler.cpp')
| -rw-r--r-- | src/chat-server/guildhandler.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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<Guild *> 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(); |