Remove reference to network session from player objects.

This commit is contained in:
lotodore
2011-03-10 19:26:04 +00:00
parent 5ab043d533
commit 5857f07309
11 changed files with 35 additions and 47 deletions
+8 -5
View File
@@ -26,7 +26,7 @@ ClientPlayer::ClientPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType
: PlayerInterface(), myConfig(c), currentHand(0), myID(id), myUniqueID(uniqueId), myType(type),
myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myLastRelativeSet(0),
myAction(0), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0),
lastMoneyWon(0), sBluff(0), sBluffStatus(false), myWinnerState(false)
lastMoneyWon(0), sBluff(0), sBluffStatus(false), myWinnerState(false), m_isConnected(false)
{
myBestHandPosition[0] = myBestHandPosition[1] = myBestHandPosition[2] = myBestHandPosition[3] = myBestHandPosition[4] = 0;
myNiveau[0] = myNiveau[1] = myNiveau[2] = 0;
@@ -513,16 +513,19 @@ ClientPlayer::riverEngine3()
{
}
void ClientPlayer::setNetSessionData(boost::shared_ptr<SessionData> session)
void
ClientPlayer::setIsConnected(bool connected)
{
boost::recursive_mutex::scoped_lock lock(m_syncMutex);
myNetSessionData = session;
m_isConnected = connected;
}
boost::shared_ptr<SessionData> ClientPlayer::getNetSessionData()
bool
ClientPlayer::isConnected() const
{
boost::recursive_mutex::scoped_lock lock(m_syncMutex);
return myNetSessionData;
return m_isConnected;
}
bool ClientPlayer::checkIfINeedToShowCards()
+3 -4
View File
@@ -130,8 +130,8 @@ public:
void evaluation(int, int);
void setNetSessionData(boost::shared_ptr<SessionData> session);
boost::shared_ptr<SessionData> getNetSessionData();
void setIsConnected(bool connected);
bool isConnected() const;
// unused as client
unsigned getActionTimeoutCounter() const {
@@ -184,8 +184,7 @@ private:
bool sBluffStatus;
bool myWinnerState;
boost::shared_ptr<SessionData> myNetSessionData;
bool m_isConnected;
};
#endif