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

Adding chat reject message if chat is tried to be sent in an invalid state. Otherwise testing won't work.

Browse Source
This commit is contained in:
lotodore
2011-02-17 23:57:58 +00:00
parent 1840efb60f
commit e5b9b29564
108 changed files with 962 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+14 -1
View File
@@ -1357,6 +1357,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(SessionWrapper session, const std::st
void
ServerLobbyThread::HandleNetPacketChatRequest(SessionWrapper session, const ChatRequestMessage_t &chatRequest)
{
bool chatSent = false;
// Guests are not allowed to chat.
if (session.playerData && session.playerData->GetRights() != PLAYER_RIGHTS_GUEST) {
if (chatRequest.chatRequestType.present == chatRequestType_PR_chatRequestTypeLobby) {
@@ -1385,6 +1386,7 @@ ServerLobbyThread::HandleNetPacketChatRequest(SessionWrapper session, const Chat
session.playerData->GetUniqueId(),
session.playerData->GetName(),
chatMsg);
chatSent = true;
} else if (chatRequest.chatRequestType.present == chatRequestType_PR_chatRequestTypePrivate) {
const ChatRequestTypePrivate_t *netPrivateChat = &chatRequest.chatRequestType.choice.chatRequestTypePrivate;
SessionWrapper targetSession = m_sessionManager.GetSessionByUniquePlayerId(netPrivateChat->targetPlayerId);
@@ -1393,7 +1395,6 @@ ServerLobbyThread::HandleNetPacketChatRequest(SessionWrapper session, const Chat
if (targetSession.sessionData && targetSession.playerData) {
// Only allow private messages to players which are not in running games.
// TODO: Send chat reject message if private message was not sent.
unsigned gameId = targetSession.sessionData->GetGameId();
GameMap::const_iterator pos = m_gameMap.find(gameId);
if (pos == m_gameMap.end() || !pos->second->IsRunning()) {
@@ -1408,10 +1409,22 @@ ServerLobbyThread::HandleNetPacketChatRequest(SessionWrapper session, const Chat
(char *)chatRequest.chatText.buf,
chatRequest.chatText.size);
GetSender().Send(targetSession.sessionData, packet);
chatSent = true;
}
}
}
}
// Other chat types are not allowed in the lobby.
if (!chatSent) {
boost::shared_ptr<NetPacket> packet(new NetPacket(NetPacket::Alloc));
packet->GetMsg()->present = PokerTHMessage_PR_chatRejectMessage;
ChatRejectMessage_t *netReject = &packet->GetMsg()->choice.chatRejectMessage;
OCTET_STRING_fromBuf(
&netReject->chatText,
(char *)chatRequest.chatText.buf,
chatRequest.chatText.size);
GetSender().Send(session.sessionData, packet);
}
}
void