Fixed linefeeds.
This commit is contained in:
@@ -87,12 +87,12 @@ ServerGameThread::AddSession(SessionWrapper session)
|
|||||||
m_sessionQueue.push_back(session);
|
m_sessionQueue.push_back(session);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ServerGameThread::KickPlayer(unsigned playerId)
|
ServerGameThread::KickPlayer(unsigned playerId)
|
||||||
{
|
{
|
||||||
boost::mutex::scoped_lock lock(m_kickPlayerListMutex);
|
boost::mutex::scoped_lock lock(m_kickPlayerListMutex);
|
||||||
m_kickPlayerList.push_back(playerId);
|
m_kickPlayerList.push_back(playerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
GameState
|
GameState
|
||||||
ServerGameThread::GetCurRound() const
|
ServerGameThread::GetCurRound() const
|
||||||
@@ -163,24 +163,24 @@ ServerGameThread::Main()
|
|||||||
GetLobbyThread().RemoveGame(GetId());
|
GetLobbyThread().RemoveGame(GetId());
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ServerGameThread::KickPlayerLoop()
|
ServerGameThread::KickPlayerLoop()
|
||||||
{
|
{
|
||||||
boost::mutex::scoped_lock lock(m_kickPlayerListMutex);
|
boost::mutex::scoped_lock lock(m_kickPlayerListMutex);
|
||||||
|
|
||||||
PlayerIdList::iterator i = m_kickPlayerList.begin();
|
PlayerIdList::iterator i = m_kickPlayerList.begin();
|
||||||
PlayerIdList::iterator end = m_kickPlayerList.end();
|
PlayerIdList::iterator end = m_kickPlayerList.end();
|
||||||
|
|
||||||
while (i != end)
|
while (i != end)
|
||||||
{
|
{
|
||||||
SessionWrapper tmpSession = GetSessionManager().GetSessionByUniquePlayerId(*i);
|
SessionWrapper tmpSession = GetSessionManager().GetSessionByUniquePlayerId(*i);
|
||||||
// Only kick if the player was found.
|
// Only kick if the player was found.
|
||||||
if (tmpSession.sessionData.get())
|
if (tmpSession.sessionData.get())
|
||||||
SessionError(tmpSession, ERR_NET_PLAYER_KICKED);
|
SessionError(tmpSession, ERR_NET_PLAYER_KICKED);
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
m_kickPlayerList.clear();
|
m_kickPlayerList.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ServerGameThread::InternalStartGame()
|
ServerGameThread::InternalStartGame()
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
#include <core/boost/timers.hpp>
|
#include <core/boost/timers.hpp>
|
||||||
|
|
||||||
#define LOBBY_THREAD_TERMINATE_TIMEOUT_MSEC 20000
|
#define LOBBY_THREAD_TERMINATE_TIMEOUT_MSEC 20000
|
||||||
#define ADMIN_IRC_TERMINATE_TIMEOUT_MSEC 2000
|
#define ADMIN_IRC_TERMINATE_TIMEOUT_MSEC 2000
|
||||||
|
|
||||||
|
|
||||||
class SenderThread;
|
class SenderThread;
|
||||||
|
|||||||
Reference in New Issue
Block a user