diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 3b010ddc..bd80dc1d 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -946,6 +946,7 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptrsetMySetAbsolute(actionDoneData.totalPlayerBet); tmpPlayer->setMyCash(actionDoneData.playerMoney); curGame->getCurrentHand()->getCurrentBeRo()->setHighestSet(actionDoneData.highestSet); + curGame->getCurrentHand()->getCurrentBeRo()->setMinimumRaise(actionDoneData.minimumRaise); curGame->getCurrentHand()->getBoard()->collectSets(); curGame->getCurrentHand()->switchRounds(); @@ -991,7 +992,6 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptrgetCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId(tmpPlayer->getMyID()); - curGame->getCurrentHand()->getCurrentBeRo()->setMinimumRaise(turnData.minimumRaise); curGame->getCurrentHand()->getCurrentBeRo()->setPlayersTurn(tmpPlayer->getMyID()); // Mark current player in GUI. diff --git a/src/net/common/netpacket.cpp b/src/net/common/netpacket.cpp index 53a3eb6b..4f4cdaf1 100644 --- a/src/net/common/netpacket.cpp +++ b/src/net/common/netpacket.cpp @@ -367,7 +367,6 @@ struct GCC_PACKED NetPacketPlayersTurnData { NetPacketHeader head; u_int32_t playerId; - u_int32_t minimumRaise; u_int16_t gameState; u_int16_t reserved; }; @@ -389,6 +388,7 @@ struct GCC_PACKED NetPacketPlayersActionDoneData u_int32_t totalPlayerBet; u_int32_t playerMoney; u_int32_t highestSet; + u_int32_t minimumRaise; }; struct GCC_PACKED NetPacketPlayersActionRejectedData @@ -3264,7 +3264,6 @@ NetPacketPlayersTurn::SetData(const NetPacketPlayersTurn::Data &inData) tmpData->playerId = htonl(inData.playerId); tmpData->gameState = htons(inData.gameState); - tmpData->minimumRaise = htonl(inData.minimumRaise); // Check the packet - just in case. Check(GetRawData()); @@ -3277,7 +3276,6 @@ NetPacketPlayersTurn::GetData(NetPacketPlayersTurn::Data &outData) const outData.playerId = ntohl(tmpData->playerId); outData.gameState = static_cast(ntohs(tmpData->gameState)); - outData.minimumRaise = ntohl(tmpData->minimumRaise); } const NetPacketPlayersTurn * @@ -3404,6 +3402,7 @@ NetPacketPlayersActionDone::SetData(const NetPacketPlayersActionDone::Data &inDa tmpData->totalPlayerBet = htonl(inData.totalPlayerBet); tmpData->playerMoney = htonl(inData.playerMoney); tmpData->highestSet = htonl(inData.highestSet); + tmpData->minimumRaise = htonl(inData.minimumRaise); // Check the packet - just in case. Check(GetRawData()); @@ -3420,6 +3419,7 @@ NetPacketPlayersActionDone::GetData(NetPacketPlayersActionDone::Data &outData) c outData.totalPlayerBet = ntohl(tmpData->totalPlayerBet); outData.playerMoney = ntohl(tmpData->playerMoney); outData.highestSet = ntohl(tmpData->highestSet); + outData.minimumRaise = ntohl(tmpData->minimumRaise); } const NetPacketPlayersActionDone * diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index ecad40bc..38b853ac 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -77,6 +77,7 @@ static void SendPlayerAction(ServerGameThread &server, boost::shared_ptrgetMySet(); actionDoneData.playerMoney = player->getMyCash(); actionDoneData.highestSet = server.GetGame().getCurrentHand()->getCurrentBeRo()->getHighestSet(); + actionDoneData.minimumRaise = server.GetGame().getCurrentHand()->getCurrentBeRo()->getMinimumRaise(); static_cast(notifyActionDone.get())->SetData(actionDoneData); server.SendToAllPlayers(notifyActionDone, SessionData::Game); } @@ -710,7 +711,6 @@ ServerGameStateStartRound::Process(ServerGameThread &server) NetPacketPlayersTurn::Data playersTurnData; playersTurnData.gameState = (GameState)curGame.getCurrentHand()->getCurrentRound(); playersTurnData.playerId = curPlayer->getMyUniqueID(); - playersTurnData.minimumRaise = curGame.getCurrentHand()->getCurrentBeRo()->getMinimumRaise(); static_cast(notification.get())->SetData(playersTurnData); server.SendToAllPlayers(notification, SessionData::Game); diff --git a/src/net/netpacket.h b/src/net/netpacket.h index 5dcab030..0da9158a 100644 --- a/src/net/netpacket.h +++ b/src/net/netpacket.h @@ -842,7 +842,6 @@ public: { GameState gameState; u_int32_t playerId; - u_int32_t minimumRaise; }; NetPacketPlayersTurn(); @@ -896,6 +895,7 @@ public: u_int32_t totalPlayerBet; u_int32_t playerMoney; u_int32_t highestSet; + u_int32_t minimumRaise; }; NetPacketPlayersActionDone();