sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use client game id when kicking players during game.

Browse Source
This commit is contained in:
lotodore
2007-10-28 19:38:49 +00:00
parent ffc8bb4485
commit 3ea61381ef
7 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
+16 -2
View File
@@ -56,7 +56,7 @@ private:
ClientThread::ClientThread(GuiInterface &gui, AvatarManager &avatarManager)
: m_curState(NULL), m_gui(gui), m_avatarManager(avatarManager),
m_curGameId(1), m_guiPlayerId(0), m_sessionEstablished(false)
m_curGameId(0), m_curGameNum(1), m_guiPlayerId(0), m_sessionEstablished(false)
{
m_context.reset(new ClientContext);
m_senderCallback.reset(new ClientSenderCallback(*this));
@@ -331,7 +331,7 @@ ClientThread::Main()
MapPlayerDataList();
if (GetPlayerDataList().size() != (unsigned)GetStartData().numberOfPlayers)
throw ClientException(__FILE__, __LINE__, ERR_NET_INVALID_PLAYER_COUNT, 0);
m_game.reset(new Game(&m_gui, factory, GetPlayerDataList(), GetGameData(), GetStartData(), m_curGameId++));
m_game.reset(new Game(&m_gui, factory, GetPlayerDataList(), GetGameData(), GetStartData(), m_curGameNum++));
// Initialize GUI speed.
GetGui().initGui(GetGameData().guiSpeed);
// Signal start of game to GUI.
@@ -566,6 +566,20 @@ ClientThread::GetReceiver()
return *m_receiver;
}
unsigned
ClientThread::GetGameId() const
{
boost::mutex::scoped_lock lock(m_curGameIdMutex);
return m_curGameId;
}
void
ClientThread::SetGameId(unsigned id)
{
boost::mutex::scoped_lock lock(m_curGameIdMutex);
m_curGameId = id;
}
const GameData &
ClientThread::GetGameData() const
{