From a8a47104f3fc7e48b980eb3da3cfd85ac9ff4245 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sun, 6 Jun 2010 15:11:13 +0200 Subject: Made methods of the Guild class const where appropriate --- src/chat-server/guildhandler.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/chat-server/guildhandler.cpp') diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index 8067cb7..523e68a 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -54,15 +54,10 @@ void ChatHandler::sendGuildRejoin(ChatClient &client) std::vector guilds = guildManager->getGuildsForPlayer(client.characterId); for (unsigned int i = 0; i != guilds.size(); ++i) { - Guild *guild = guilds[i]; - short permissions; - if (!guild) - { - return; - } - permissions = guild->getUserPermissions(client.characterId); + const Guild *guild = guilds[i]; - std::string guildName = guild->getName(); + const int permissions = guild->getUserPermissions(client.characterId); + const std::string guildName = guild->getName(); // Tell the client what guilds the character belongs to and their permissions MessageOut msg(CPMSG_GUILD_REJOIN); @@ -80,7 +75,6 @@ void ChatHandler::sendGuildRejoin(ChatClient &client) client.send(msg); sendGuildListUpdate(guildName, client.characterName, GUILD_EVENT_ONLINE_PLAYER); - } } -- cgit