From fec3a5fb65dd249ca915415e57f82dabfe067f31 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 13 Nov 2011 16:28:04 +0000 Subject: [PATCH] Only send cardsvalue if round before was "river". --- src/net/common/servergamestate.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index 636af96c..dc3f7b91 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -184,7 +184,7 @@ static void PerformPlayerAction(ServerGame &server, boost::shared_ptr tmpPlayer) +SetPlayerResult(PlayerResult_t &playerResult, boost::shared_ptr tmpPlayer, GameState roundBeforePostRiver) { playerResult.playerId = tmpPlayer->getMyUniqueID(); int tmpCards[2]; @@ -199,8 +199,10 @@ SetPlayerResult(PlayerResult_t &playerResult, boost::shared_ptr ASN_SEQUENCE_ADD(&playerResult.bestHandPosition.list, handPos); } - playerResult.cardsValue = (long *)calloc(1, sizeof(long)); - *playerResult.cardsValue = tmpPlayer->getMyCardsValueInt(); + if (roundBeforePostRiver == GAME_STATE_RIVER) { + playerResult.cardsValue = (long *)calloc(1, sizeof(long)); + *playerResult.cardsValue = tmpPlayer->getMyCardsValueInt(); + } playerResult.moneyWon = tmpPlayer->getLastMoneyWon(); playerResult.playerMoney = tmpPlayer->getMyCash(); } @@ -989,7 +991,7 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr server) boost::shared_ptr tmpPlayer(curGame.getPlayerByUniqueId(*i)); if (tmpPlayer) { PlayerResult_t *playerResult = (PlayerResult_t *)calloc(1, sizeof(PlayerResult_t)); - SetPlayerResult(*playerResult, tmpPlayer); + SetPlayerResult(*playerResult, tmpPlayer, GAME_STATE_RIVER); ASN_SEQUENCE_ADD(&endHandShow->playerResults.list, playerResult); } @@ -1486,7 +1488,7 @@ ServerGameStateWaitNextHand::InternalProcessPacket(boost::shared_ptr AfterHandShowCardsMessage_t *netShowCards = &show->GetMsg()->choice.afterHandShowCardsMessage; boost::shared_ptr tmpPlayer(curGame.getPlayerByUniqueId(session->GetPlayerData()->GetUniqueId())); if (tmpPlayer) { - SetPlayerResult(netShowCards->playerResult, tmpPlayer); + SetPlayerResult(netShowCards->playerResult, tmpPlayer, curGame.getCurrentHand()->getRoundBeforePostRiver()); server->SendToAllPlayers(show, SessionData::Game); } }