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

Implementing player list for new lobby chat.

Browse Source
This commit is contained in:
lotodore
2009-08-15 22:20:19 +00:00
parent 51d8883e88
commit a380497bc2
6 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+16 -5
View File
@@ -730,7 +730,6 @@ AbstractClientStateReceiving::HandlePacket(boost::shared_ptr<ClientThread> clien
if (netInfo->avatarData != NULL)
{
tmpInfo.hasAvatar = true;
// TODO: use sha1.
memcpy(tmpInfo.avatar.data, netInfo->avatarData->avatar.buf, MD5_DATA_SIZE);
tmpInfo.avatarType = (AvatarFileType)netInfo->avatarData->avatarType;
}
@@ -840,11 +839,23 @@ AbstractClientStateReceiving::HandlePacket(boost::shared_ptr<ClientThread> clien
else if (tmpPacket->GetMsg()->present == PokerTHMessage_PR_playerListMessage)
{
PlayerListMessage_t *netPlayerList = &tmpPacket->GetMsg()->choice.playerListMessage;
PlayerInfo info;
if (!client->GetCachedPlayerInfo(netPlayerList->playerId, info))
if (netPlayerList->playerListNotification == playerListNotification_playerListNew)
{
// Request player info.
client->RequestPlayerInfo(netPlayerList->playerId);
PlayerInfo info;
if (!client->GetCachedPlayerInfo(netPlayerList->playerId, info))
{
// Request player info.
ostringstream name;
name << "#" << netPlayerList->playerId;
info.playerName = name.str();
client->RequestPlayerInfo(netPlayerList->playerId);
}
client->GetCallback().SignalLobbyPlayerJoined(netPlayerList->playerId, info.playerName);
}
else if (netPlayerList->playerListNotification == playerListNotification_playerListLeft)
{
client->GetCallback().SignalLobbyPlayerLeft(netPlayerList->playerId);
}
}
else if (tmpPacket->GetMsg()->present == PokerTHMessage_PR_gameListMessage)
src/net/common/serverlobbythread.cpp
+19 -3
View File
@@ -263,6 +263,8 @@ ServerLobbyThread::CloseSession(SessionWrapper session)
m_sessionManager.RemoveSession(session.sessionData->GetId());
m_gameSessionManager.RemoveSession(session.sessionData->GetId());
if (session.playerData)
NotifyPlayerLeftLobby(session.playerData->GetUniqueId());
// Update stats (if needed).
UpdateStatisticsNumberOfPlayers();
}
@@ -274,6 +276,22 @@ ServerLobbyThread::ResubscribeLobbyMsg(SessionWrapper session)
InternalResubscribeMsg(session);
}
void
ServerLobbyThread::NotifyPlayerJoinedLobby(unsigned playerId)
{
boost::shared_ptr<NetPacket> notify = CreateNetPacketPlayerListNew(playerId);
m_sessionManager.SendLobbyMsgToAllSessions(GetSender(), notify, SessionData::Established);
m_gameSessionManager.SendLobbyMsgToAllSessions(GetSender(), notify, SessionData::Game);
}
void
ServerLobbyThread::NotifyPlayerLeftLobby(unsigned playerId)
{
boost::shared_ptr<NetPacket> notify = CreateNetPacketPlayerListLeft(playerId);
m_sessionManager.SendLobbyMsgToAllSessions(GetSender(), notify, SessionData::Established);
m_gameSessionManager.SendLobbyMsgToAllSessions(GetSender(), notify, SessionData::Game);
}
void
ServerLobbyThread::NotifyPlayerJoinedGame(unsigned gameId, unsigned playerId)
{
@@ -1129,9 +1147,7 @@ ServerLobbyThread::EstablishSession(SessionWrapper session)
m_statDataChanged = true;
}
// Notify all players.
boost::shared_ptr<NetPacket> notify = CreateNetPacketPlayerListNew(session.playerData->GetUniqueId());
m_sessionManager.SendLobbyMsgToAllSessions(GetSender(), notify, SessionData::Established);
m_gameSessionManager.SendLobbyMsgToAllSessions(GetSender(), notify, SessionData::Game);
NotifyPlayerJoinedLobby(session.playerData->GetUniqueId());
UpdateStatisticsNumberOfPlayers();
}