diff --git a/src/net/common/servergamethread.cpp b/src/net/common/servergamethread.cpp index 23129752..dbed52b5 100644 --- a/src/net/common/servergamethread.cpp +++ b/src/net/common/servergamethread.cpp @@ -87,12 +87,12 @@ ServerGameThread::AddSession(SessionWrapper session) m_sessionQueue.push_back(session); } -void -ServerGameThread::KickPlayer(unsigned playerId) -{ - boost::mutex::scoped_lock lock(m_kickPlayerListMutex); - m_kickPlayerList.push_back(playerId); -} +void +ServerGameThread::KickPlayer(unsigned playerId) +{ + boost::mutex::scoped_lock lock(m_kickPlayerListMutex); + m_kickPlayerList.push_back(playerId); +} GameState ServerGameThread::GetCurRound() const @@ -163,24 +163,24 @@ ServerGameThread::Main() GetLobbyThread().RemoveGame(GetId()); } -void -ServerGameThread::KickPlayerLoop() -{ - boost::mutex::scoped_lock lock(m_kickPlayerListMutex); - - PlayerIdList::iterator i = m_kickPlayerList.begin(); - PlayerIdList::iterator end = m_kickPlayerList.end(); - - while (i != end) - { +void +ServerGameThread::KickPlayerLoop() +{ + boost::mutex::scoped_lock lock(m_kickPlayerListMutex); + + PlayerIdList::iterator i = m_kickPlayerList.begin(); + PlayerIdList::iterator end = m_kickPlayerList.end(); + + while (i != end) + { SessionWrapper tmpSession = GetSessionManager().GetSessionByUniquePlayerId(*i); // Only kick if the player was found. if (tmpSession.sessionData.get()) SessionError(tmpSession, ERR_NET_PLAYER_KICKED); - ++i; - } - m_kickPlayerList.clear(); -} + ++i; + } + m_kickPlayerList.clear(); +} void ServerGameThread::InternalStartGame() diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h index fc23f9ad..4a76d608 100644 --- a/src/net/serverlobbythread.h +++ b/src/net/serverlobbythread.h @@ -32,7 +32,7 @@ #include #define LOBBY_THREAD_TERMINATE_TIMEOUT_MSEC 20000 -#define ADMIN_IRC_TERMINATE_TIMEOUT_MSEC 2000 +#define ADMIN_IRC_TERMINATE_TIMEOUT_MSEC 2000 class SenderThread;