diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-24 19:17:41 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-04-02 20:57:16 +0200 |
| commit | 59919635523d41f3a15120c83db4b7d080c155de (patch) | |
| tree | 0da989bd2342b5a53d49c26893a3a544e7432fcc /src/net/manaserv/guildhandler.cpp | |
| parent | 7ea1c4574d6e845f95f2c4c3a1dd4a5d730bc6ba (diff) | |
| download | mana-59919635523d41f3a15120c83db4b7d080c155de.tar.gz mana-59919635523d41f3a15120c83db4b7d080c155de.tar.bz2 mana-59919635523d41f3a15120c83db4b7d080c155de.tar.xz mana-59919635523d41f3a15120c83db4b7d080c155de.zip | |
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
Diffstat (limited to 'src/net/manaserv/guildhandler.cpp')
| -rw-r--r-- | src/net/manaserv/guildhandler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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); |