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

Allow kicking of computer players.

Browse Source
This commit is contained in:
lotodore
2008-12-08 23:06:11 +00:00
parent 30718d55e6
commit 4905f618ad
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergamethread.cpp
+47 -1
View File
@@ -310,6 +310,12 @@ ServerGameThread::InternalKickPlayer(unsigned playerId)
// Only kick if the player was found.
if (tmpSession.sessionData.get())
MoveSessionToLobby(tmpSession, NTF_NET_REMOVED_KICKED);
else
{
boost::shared_ptr<PlayerData> tmpData(RemoveComputerPlayer(playerId));
if (tmpData)
RemovePlayerData(tmpData, NTF_NET_REMOVED_KICKED);
}
}
void
@@ -507,6 +513,45 @@ ServerGameThread::AddComputerPlayer(boost::shared_ptr<PlayerData> player)
GetLobbyThread().AddComputerPlayer(player);
}
boost::shared_ptr<PlayerData>
ServerGameThread::RemoveComputerPlayer(unsigned playerId)
{
boost::shared_ptr<PlayerData> tmpPlayer;
{
boost::mutex::scoped_lock lock(m_computerPlayerListMutex);
PlayerDataList::iterator i = m_computerPlayerList.begin();
PlayerDataList::iterator end = m_computerPlayerList.end();
while (i != end)
{
if ((*i)->GetUniqueId() == playerId)
{
tmpPlayer = *i;
m_computerPlayerList.erase(i);
break;
}
++i;
}
}
GetLobbyThread().RemoveComputerPlayer(tmpPlayer);
return tmpPlayer;
}
bool
ServerGameThread::IsComputerPlayerActive(unsigned playerId) const
{
bool retVal = false;
boost::mutex::scoped_lock lock(m_computerPlayerListMutex);
PlayerDataList::const_iterator i = m_computerPlayerList.begin();
PlayerDataList::const_iterator end = m_computerPlayerList.end();
while (i != end)
{
if ((*i)->GetUniqueId() == playerId)
retVal = true;
++i;
}
return retVal;
}
void
ServerGameThread::ResetComputerPlayerList()
{
@@ -613,7 +658,8 @@ ServerGameThread::RemoveDisconnectedPlayers()
while (i != end)
{
boost::shared_ptr<PlayerInterface> tmpPlayer = *i;
if (!GetSessionManager().IsPlayerConnected(tmpPlayer->getMyUniqueID()) && tmpPlayer->getMyType() == PLAYER_TYPE_HUMAN)
if ((tmpPlayer->getMyType() == PLAYER_TYPE_HUMAN && !GetSessionManager().IsPlayerConnected(tmpPlayer->getMyUniqueID()))
|| (tmpPlayer->getMyType() == PLAYER_TYPE_COMPUTER && !IsComputerPlayerActive(tmpPlayer->getMyUniqueID())))
{
// Setting player cash to 0 will deactivate the player.
tmpPlayer->setMyCash(0);