More work on rejoin. This is still broken because the player id is not yet updated on client side, and the server still does not activate the rejoining player.

src/net/servergame.h

@@ -87,6 +87,9 @@ public:
 
 	void SetPlayerAutoLeaveOnFinish(unsigned playerId);
 
+	void AddRejoinPlayer(unsigned playerId);
+	PlayerIdList GetAndResetRejoinPlayers();
+
 	unsigned GetSmallDelaySec() const;
 
 	// should be protected, but is needed in function.
@@ -173,6 +176,9 @@ private:
 	PlayerIdList m_autoLeavePlayerList;
 	mutable boost::mutex m_autoLeavePlayerListMutex;
 
+	PlayerIdList m_rejoinPlayerList;
+	mutable boost::mutex m_rejoinPlayerListMutex;
+
 	PlayerIdList m_reportedAvatarList;
 
 	RankingMap m_rankingMap;