From 26f01f09463e44110939124503f2931e960e0e3f Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 5 Nov 2011 20:53:59 +0000 Subject: [PATCH] Trying to fix problem with client active status on rejoin. --- src/net/common/clientstate.cpp | 2 ++ src/net/common/clientthread.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 89b490f0..ac0c1592 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -1694,6 +1694,8 @@ ClientStateWaitHand::InternalHandlePacket(boost::shared_ptr client if (!tmpPlayer) throw ClientException(__FILE__, __LINE__, ERR_NET_UNKNOWN_PLAYER_ID, 0); tmpPlayer->setMyUniqueID(idChanged->newPlayerId); + // This player is now active again. + tmpPlayer->setMyActiveStatus(true); // Also update the dealer, if necessary. curGame->replaceDealer(idChanged->oldPlayerId, idChanged->newPlayerId); } diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index 99c4d444..8824be1d 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -1162,7 +1162,7 @@ ClientThread::RemoveDisconnectedPlayers() if (tmpPlayer->getMyActiveStatus()) { // If a player is not in the player data list, it was disconnected. if (!GetPlayerDataByUniqueId(tmpPlayer->getMyUniqueID()).get()) { - tmpPlayer->setMyCash(0); + //tmpPlayer->setMyCash(0); tmpPlayer->setMyActiveStatus(false); } }