Remove players from game (without possibility to rejoin) if they did not act within a certain time. Feature is still broken, because the timer is canceled on disconnect.

src/engine/game.cpp

@@ -96,7 +96,7 @@ Game::Game(GuiInterface* gui, boost::shared_ptr<EngineFactory> factory,
 
 		// create player objects
 		boost::shared_ptr<PlayerInterface> tmpPlayer = myFactory->createPlayer(i, uniqueId, type, myName, myAvatarFile, myStartCash, startQuantityPlayers > i, 0);
-		tmpPlayer->setIsConnected(true);
+		tmpPlayer->setIsSessionActive(true);
 		tmpPlayer->setMyGuid(myGuid);
 
 		// fill player lists

src/engine/local_engine/localplayer.cpp

@@ -849,7 +849,7 @@ LocalPlayer::LocalPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType ty
 	: PlayerInterface(), myConfig(c), currentHand(0), myID(id), myUniqueID(uniqueId), myType(type), myName(name), myAvatar(avatar),
 	  myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), logHoleCardsDone(false), myCash(sC), mySet(0), myLastRelativeSet(0), myAction(PLAYER_ACTION_NONE),
 	  myButton(mB), myActiveStatus(aS), myStayOnTableStatus(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0),
-	  sBluff(0), sBluffStatus(false), m_actionTimeoutCounter(0), m_isConnected(false), m_isKicked(false)
+	  sBluff(0), sBluffStatus(false), m_actionTimeoutCounter(0), m_isSessionActive(false), m_isKicked(false)
 {
 
 	// !!!!!!!!!!!!!!!!!!!!!!!! testing !!!!!!!!!!!!!!!!!!!!!!!!
@@ -5094,14 +5094,14 @@ void LocalPlayer::riverEngine3()
 
 }
 
-void LocalPlayer::setIsConnected(bool connected)
+void LocalPlayer::setIsSessionActive(bool active)
 {
-	m_isConnected = connected;
+	m_isSessionActive = active;
 }
 
-bool LocalPlayer::isConnected() const
+bool LocalPlayer::isSessionActive() const
 {
-	return m_isConnected;
+	return m_isSessionActive;
 }
 
 void LocalPlayer::setIsKicked(bool kicked)

src/engine/local_engine/localplayer.h

@@ -280,8 +280,8 @@ public:
 
 	void evaluation(int, int);
 
-	void setIsConnected(bool connected);
-	bool isConnected() const;
+	void setIsSessionActive(bool active);
+	bool isSessionActive() const;
 	void setIsKicked(bool kicked);
 	bool isKicked() const;
 
@@ -334,7 +334,7 @@ private:
 	bool sBluffStatus;
 
 	unsigned m_actionTimeoutCounter;
-	bool m_isConnected;
+	bool m_isSessionActive;
 	bool m_isKicked;
 };
 

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), logHoleCardsDone(false), myCash(sC), mySet(0), myLastRelativeSet(0),
 	  myAction(PLAYER_ACTION_NONE), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0),
-	  lastMoneyWon(0), sBluff(0), sBluffStatus(false), m_isConnected(false), m_isKicked(false)
+	  lastMoneyWon(0), sBluff(0), sBluffStatus(false), m_isSessionActive(false), m_isKicked(false)
 {
 	myBestHandPosition[0] = myBestHandPosition[1] = myBestHandPosition[2] = myBestHandPosition[3] = myBestHandPosition[4] = 0;
 	myNiveau[0] = myNiveau[1] = myNiveau[2] = 0;
@@ -536,17 +536,17 @@ ClientPlayer::riverEngine3()
 
 
 void
-ClientPlayer::setIsConnected(bool connected)
+ClientPlayer::setIsSessionActive(bool active)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	m_isConnected = connected;
+	m_isSessionActive = active;
 }
 
 bool
-ClientPlayer::isConnected() const
+ClientPlayer::isSessionActive() const
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	return m_isConnected;
+	return m_isSessionActive;
 }
 
 void

src/engine/network_engine/clientplayer.h

@@ -133,8 +133,8 @@ public:
 
 	void evaluation(int, int);
 
-	void setIsConnected(bool connected);
-	bool isConnected() const;
+	void setIsSessionActive(bool active);
+	bool isSessionActive() const;
 	void setIsKicked(bool kicked);
 	bool isKicked() const;
 
@@ -183,7 +183,7 @@ private:
 	int sBluff;
 	bool sBluffStatus;
 
-	bool m_isConnected;
+	bool m_isSessionActive;
 	bool m_isKicked;
 };
 

src/engine/playerinterface.h

@@ -118,8 +118,8 @@ public:
 	virtual void turnEngine() =0;
 	virtual void riverEngine() =0;
 
-	virtual void setIsConnected(bool connected) =0;
-	virtual bool isConnected() const=0;
+	virtual void setIsSessionActive(bool connected) =0;
+	virtual bool isSessionActive() const=0;
 	virtual void setIsKicked(bool kicked) =0;
 	virtual bool isKicked() const=0;