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

Send list of cards which need to be shown instead of all cards of non-fold players.

Browse Source
This commit is contained in:
lotodore
2010-07-23 15:55:52 +00:00
parent 15b513fb85
commit cc897745c4
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+3
View File
@@ -2007,6 +2007,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
// End of Hand, show cards.
list<unsigned> winnerList;
list<unsigned> showList;
int highestValueOfCards = 0;
PlayerResult_t **playerResults = showCards->playerResults.list.array;
unsigned numResults = showCards->playerResults.list.count;
@@ -2034,11 +2035,13 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
tmpPlayer->setLastMoneyWon(r->moneyWon);
if (r->moneyWon)
winnerList.push_back(r->playerId);
showList.push_back(r->playerId);
}
curGame->getCurrentHand()->getCurrentBeRo()->setHighestCardsValue(highestValueOfCards);
curGame->getCurrentHand()->getBoard()->setPot(0);
curGame->getCurrentHand()->getBoard()->setWinners(winnerList);
curGame->getCurrentHand()->getBoard()->setPlayerNeedToShowCards(showList);
client->GetGui().postRiverRunAnimation1();
src/net/common/servergamestate.cpp
+11 -7
View File
@@ -883,8 +883,8 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr<ServerGame> server)
}
else
{
// End of Hand - show cards of active players.
boost::shared_ptr<PlayerInterface> player = nonFoldPlayers.front();
// End of Hand - show cards.
const PlayerIdList showList(curGame.getCurrentHand()->getBoard()->getPlayerNeedToShowCards());
boost::shared_ptr<NetPacket> endHand(new NetPacket(NetPacket::Alloc));
endHand->GetMsg()->present = PokerTHMessage_PR_endOfHandMessage;
EndOfHandMessage_t *netEndHand = &endHand->GetMsg()->choice.endOfHandMessage;
@@ -893,15 +893,19 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr<ServerGame> server)
netEndHand->endOfHandType.present = endOfHandType_PR_endOfHandShowCards;
EndOfHandShowCards_t *endHandShow = &netEndHand->endOfHandType.choice.endOfHandShowCards;
PlayerListConstIterator i = nonFoldPlayers.begin();
PlayerListConstIterator end = nonFoldPlayers.end();
PlayerIdList::const_iterator i = showList.begin();
PlayerIdList::const_iterator end = showList.end();
while (i != end)
{
PlayerResult_t *playerResult = (PlayerResult_t *)calloc(1, sizeof(PlayerResult_t));
SetPlayerResult(*playerResult, (*i));
boost::shared_ptr<PlayerInterface> tmpPlayer(curGame.getPlayerByUniqueId(*i));
if (tmpPlayer)
{
PlayerResult_t *playerResult = (PlayerResult_t *)calloc(1, sizeof(PlayerResult_t));
SetPlayerResult(*playerResult, tmpPlayer);
ASN_SEQUENCE_ADD(&endHandShow->playerResults.list, playerResult);
ASN_SEQUENCE_ADD(&endHandShow->playerResults.list, playerResult);
}
++i;
}
server->SendToAllPlayers(endHand, SessionData::Game);