diff --git a/docs/net_protocol.txt b/docs/net_protocol.txt index de336063..62f55f65 100644 --- a/docs/net_protocol.txt +++ b/docs/net_protocol.txt @@ -738,7 +738,6 @@ PlayerResult Record +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Player Money | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -(Money Won is currently set to 0.) Server Notification: End Of Hand Hide Cards @@ -754,7 +753,6 @@ Server Notification: End Of Hand Hide Cards +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Player Money | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -(Money Won is currently set to 0.) Server Notification: End Of Game diff --git a/src/engine/network_engine/clientplayer.cpp b/src/engine/network_engine/clientplayer.cpp index 14b1979c..4acd4a16 100644 --- a/src/engine/network_engine/clientplayer.cpp +++ b/src/engine/network_engine/clientplayer.cpp @@ -309,12 +309,14 @@ ClientPlayer::getMyRoundStartCash() const void ClientPlayer::setLastMoneyWon ( int theValue ) { + boost::recursive_mutex::scoped_lock lock(m_syncMutex); lastMoneyWon = theValue; } int ClientPlayer::getLastMoneyWon() const { + boost::recursive_mutex::scoped_lock lock(m_syncMutex); return lastMoneyWon; } diff --git a/src/net/common/senderthread.cpp b/src/net/common/senderthread.cpp index f3b60b04..67081972 100644 --- a/src/net/common/senderthread.cpp +++ b/src/net/common/senderthread.cpp @@ -27,7 +27,7 @@ using namespace std; -#define SEND_TIMEOUT_MSEC 2000 +#define SEND_ERROR_TIMEOUT_MSEC 2000 SenderThread::SenderThread(SenderCallback &cb) : m_tmpOutBufSize(0), m_callback(cb) @@ -117,7 +117,7 @@ SenderThread::Main() while (!ShouldTerminate()) { - if (sendTimer.is_running() && sendTimer.elapsed().total_milliseconds() > SEND_TIMEOUT_MSEC) + if (sendTimer.is_running() && sendTimer.elapsed().total_milliseconds() > SEND_ERROR_TIMEOUT_MSEC) { RemoveCurSendData(); sendTimer.reset(); diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index 7d9c3989..8b9ec2d5 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -734,7 +734,7 @@ ServerGameStateStartRound::Process(ServerGameThread &server) boost::shared_ptr endHand(new NetPacketEndOfHandHideCards); NetPacketEndOfHandHideCards::Data endHandData; endHandData.playerId = player->getMyUniqueID(); - endHandData.moneyWon = 0; // TODO + endHandData.moneyWon = player->getLastMoneyWon(); endHandData.playerMoney = player->getMyCash(); static_cast(endHand.get())->SetData(endHandData); @@ -765,7 +765,7 @@ ServerGameStateStartRound::Process(ServerGameThread &server) tmpPlayerResult.bestHandPos[num] = bestHandPos[num]; tmpPlayerResult.valueOfCards = (*i)->getMyCardsValueInt(); - tmpPlayerResult.moneyWon = 0; // TODO + tmpPlayerResult.moneyWon = (*i)->getLastMoneyWon(); tmpPlayerResult.playerMoney = (*i)->getMyCash(); endHandData.playerResults.push_back(tmpPlayerResult);