diff options
Diffstat (limited to 'src/chat-server/guildmanager.cpp')
| -rw-r--r-- | src/chat-server/guildmanager.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp index 4b350b2c..c2131ba4 100644 --- a/src/chat-server/guildmanager.cpp +++ b/src/chat-server/guildmanager.cpp @@ -36,10 +36,9 @@ GuildManager::GuildManager(): GuildManager::~GuildManager() { - for (auto it = mGuilds.begin(); - it != mGuilds.end(); ++it) + for (auto &guildIt : mGuilds) { - delete it->second; + delete guildIt.second; } } @@ -117,11 +116,9 @@ Guild *GuildManager::findById(short id) const Guild *GuildManager::findByName(const std::string &name) const { - for (auto it = mGuilds.begin(), - it_end = mGuilds.end(); - it != it_end; ++it) + for (auto guildIt : mGuilds) { - Guild *guild = it->second; + Guild *guild = guildIt.second; if (guild->getName() == name) return guild; } @@ -136,12 +133,11 @@ bool GuildManager::doesExist(const std::string &name) const std::vector<Guild *> GuildManager::getGuildsForPlayer(int playerId) const { std::vector<Guild *> guilds; - for (auto it = mGuilds.begin(); - it != mGuilds.end(); ++it) + for (auto guildIt : mGuilds) { - if (it->second->checkInGuild(playerId)) + if (guildIt.second->checkInGuild(playerId)) { - guilds.push_back(it->second); + guilds.push_back(guildIt.second); } } return guilds; |