Remove reference to network session from player objects.

src/engine/local_engine/localplayer.cpp

@@ -847,7 +847,10 @@ static const RoundData FlopValues[] = {
 #define NUM_FLOP_VALUES (sizeof(FlopValues)/sizeof(RoundData))
 
 LocalPlayer::LocalPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB)
-	: 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(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0), sBluff(0), sBluffStatus(0), myWinnerState(false), m_actionTimeoutCounter(0)
+	: 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(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0),
+	  sBluff(0), sBluffStatus(0), myWinnerState(false), m_actionTimeoutCounter(0), m_isConnected(false)
 {
 
 	// !!!!!!!!!!!!!!!!!!!!!!!! testing !!!!!!!!!!!!!!!!!!!!!!!!
@@ -5111,14 +5114,14 @@ void LocalPlayer::riverEngine3()
 
 }
 
-void LocalPlayer::setNetSessionData(boost::shared_ptr<SessionData> session)
+void LocalPlayer::setIsConnected(bool connected)
 {
-	myNetSessionData = session;
+	m_isConnected = connected;
 }
 
-boost::shared_ptr<SessionData> LocalPlayer::getNetSessionData()
+bool LocalPlayer::isConnected() const
 {
-	return myNetSessionData;
+	return m_isConnected;
 }
 
 unsigned

src/engine/local_engine/localplayer.h

@@ -271,8 +271,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;
 
 	unsigned getActionTimeoutCounter() const;
 	void incrementActionTimeoutCounter();
@@ -323,7 +323,7 @@ private:
 	bool myWinnerState;
 
 	unsigned m_actionTimeoutCounter;
-	boost::shared_ptr<SessionData> myNetSessionData;
+	bool m_isConnected;
 };
 
 #endif

src/engine/network_engine/clientplayer.cpp

@@ -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()

src/engine/network_engine/clientplayer.h

@@ -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

src/engine/playerinterface.h

@@ -114,8 +114,8 @@ public:
 	virtual void turnEngine() =0;
 	virtual void riverEngine() =0;
 
-	virtual void setNetSessionData(boost::shared_ptr<SessionData> session) =0;
-	virtual boost::shared_ptr<SessionData> getNetSessionData() =0;
+	virtual void setIsConnected(bool connected) =0;
+	virtual bool isConnected() const=0;
 
 	virtual unsigned getActionTimeoutCounter() const =0;
 	virtual void incrementActionTimeoutCounter() =0;