From dce88bf3dae6bc06057ed2c2863020d17a05a168 Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 3 Aug 2009 22:39:08 +0000 Subject: [PATCH] Set game id for vote kick messages. --- src/net/common/clientthread.cpp | 2 ++ src/net/common/servergame.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index 7495874f..8c2c191d 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -269,6 +269,7 @@ ClientThread::SendAskKickPlayer(unsigned playerId) boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_askKickPlayerMessage; AskKickPlayerMessage_t *netAsk = &packet->GetMsg()->choice.askKickPlayerMessage; + netAsk->gameId = GetGameId(); netAsk->playerId = playerId; m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet)); } @@ -279,6 +280,7 @@ ClientThread::SendVoteKick(bool doKick) boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_voteKickRequestMessage; VoteKickRequestMessage_t *netVote = &packet->GetMsg()->choice.voteKickRequestMessage; + netVote->gameId = GetGameId(); { boost::mutex::scoped_lock lock(m_curPetitionIdMutex); netVote->petitionId = m_curPetitionId; diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index c500b138..ee6bd329 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -185,6 +185,7 @@ ServerGame::TimerVoteKick(const boost::system::error_code &ec) boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_endKickPetitionMessage; EndKickPetitionMessage_t *netEndPetition = &packet->GetMsg()->choice.endKickPetitionMessage; + netEndPetition->gameId = GetId(); netEndPetition->petitionId = m_voteKickData->petitionId; netEndPetition->numVotesAgainstKicking = m_voteKickData->numVotesAgainstKicking; netEndPetition->numVotesInFavourOfKicking = m_voteKickData->numVotesInFavourOfKicking; @@ -303,6 +304,7 @@ ServerGame::InternalAskVoteKick(SessionWrapper byWhom, unsigned playerIdWho, uns boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_startKickPetitionMessage; StartKickPetitionMessage_t *netStartPetition = &packet->GetMsg()->choice.startKickPetitionMessage; + netStartPetition->gameId = GetId(); netStartPetition->petitionId = m_voteKickData->petitionId; netStartPetition->proposingPlayerId = playerIdByWhom; netStartPetition->kickPlayerId = m_voteKickData->kickPlayerId; @@ -329,6 +331,7 @@ ServerGame::InternalDenyAskVoteKick(SessionWrapper byWhom, unsigned playerIdWho, boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_askKickDeniedMessage; AskKickDeniedMessage_t *netKickDenied = &packet->GetMsg()->choice.askKickDeniedMessage; + netKickDenied->gameId = GetId(); netKickDenied->playerId = playerIdWho; netKickDenied->kickDeniedReason = reason; GetLobbyThread().GetSender().Send(byWhom.sessionData, packet); @@ -355,6 +358,7 @@ ServerGame::InternalVoteKick(SessionWrapper byWhom, unsigned petitionId, KickVot boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_kickPetitionUpdateMessage; KickPetitionUpdateMessage_t *netKickUpdate = &packet->GetMsg()->choice.kickPetitionUpdateMessage; + netKickUpdate->gameId = GetId(); netKickUpdate->petitionId = m_voteKickData->petitionId; netKickUpdate->numVotesAgainstKicking = m_voteKickData->numVotesAgainstKicking; netKickUpdate->numVotesInFavourOfKicking = m_voteKickData->numVotesInFavourOfKicking; @@ -377,6 +381,7 @@ ServerGame::InternalDenyVoteKick(SessionWrapper byWhom, unsigned petitionId, Den boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); packet->GetMsg()->present = PokerTHMessage_PR_voteKickReplyMessage; VoteKickReplyMessage_t *netVoteReply = &packet->GetMsg()->choice.voteKickReplyMessage; + netVoteReply->gameId = GetId(); netVoteReply->petitionId = petitionId; netVoteReply->voteKickReplyType.present = voteKickReplyType_PR_voteKickDenied;