From 59919635523d41f3a15120c83db4b7d080c155de Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sun, 24 Mar 2024 19:17:41 +0100 Subject: General code cleanups * Removed some unused includes * Removed unused ListBox::mFont * Removed wrong cast to SDL_Scancode * Removed superfluous .c_str() * Removed superfluous explicit std::string construction * Removed unused variable * Use more emplace_back * Turned FindBeingFunctor into a lambda * Avoid needless pointer references for ambient layers and use a vector --- src/net/manaserv/guildhandler.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/net') diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index 398e9c62..1d927e30 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -237,8 +237,7 @@ void GuildHandler::handleMessage(MessageIn &msg) // Must remove tab first, as it wont find the guild // name after its removed from the player int guildId = msg.readInt16(); - Guild *guild = local_player->getGuild(guildId); - if (guild) + if (Guild *guild = local_player->getGuild(guildId)) { Channel *channel = channelManager->findByName(guild->getName()); channelManager->removeChannel(channel); @@ -252,8 +251,7 @@ void GuildHandler::handleMessage(MessageIn &msg) const int guildId = msg.readInt16(); std::string player = msg.readString(); - Guild *guild = local_player->getGuild(guildId); - if (guild) + if (Guild *guild = local_player->getGuild(guildId)) { Channel *channel = channelManager->findByName(guild->getName()); channelManager->removeChannel(channel); -- cgit v1.2.3-70-g09d2