From 4682b51e407cd45c93e4f4fec4181381be5fdc90 Mon Sep 17 00:00:00 2001 From: Kai Philipp Date: Sat, 30 Jul 2016 19:05:16 +0200 Subject: [PATCH] servergame GetNumJoinsPerPlayer optimized --- src/net/common/servergame.cpp | 5 +++-- src/net/common/sessionmanager.cpp | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index 34cde66d..26857151 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -1181,8 +1181,9 @@ int ServerGame::GetNumJoinsPerPlayer(const std::string &playerName) { int num = 0; - if(m_numJoinsPerPlayer.find(playerName) != m_numJoinsPerPlayer.end()) { - num = m_numJoinsPerPlayer[playerName]; + NumJoinsPerPlayerMap::const_iterator pos = m_numJoinsPerPlayer.find(playerName); + if (pos != m_numJoinsPerPlayer.end()) { + num = pos->second; } return num; } diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp index 67599b62..f4e00461 100644 --- a/src/net/common/sessionmanager.cpp +++ b/src/net/common/sessionmanager.cpp @@ -260,11 +260,10 @@ SessionManager::IsGuestAllowedToConnect(const std::string &clientAddress) const int num = 0; while (i != end) { boost::shared_ptr tmpPlayer(i->second->GetPlayerData()); - if(tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST) { + if (tmpPlayer && tmpPlayer->GetRights() == PLAYER_RIGHTS_GUEST) { num++; - if(i->second->GetClientAddr() == clientAddress) { + if (i->second->GetClientAddr() == clientAddress) { // guest has same ip as another guest in lobby or - // number of guests in lobby >= SERVER_MAX_GUEST_USERS_LOBBY => not allowed retVal = false; break; }