More work on rejoin: The server now detects when a rejoin is possible and allows the player to login directly, without waiting for a possible existing connection to be terminated. A session GUID is stored in the cache directory on client side for this purpose.

2011-08-28 17:14:03 +00:00
parent 0a49783889
commit 32ba77709e
18 changed files with 195 additions and 24 deletions
@@ -26,7 +26,7 @@ PlayerData::PlayerData(unsigned uniqueId, int number, PlayerType type, PlayerRig
 }

 PlayerData::PlayerData(const PlayerData &other)
-	: m_uniqueId(other.GetUniqueId()), m_dbId(other.GetDBId()), m_number(other.GetNumber()), m_name(other.GetName()),
+	: m_uniqueId(other.GetUniqueId()), m_dbId(other.GetDBId()), m_number(other.GetNumber()), m_guid(other.GetGuid()), m_name(other.GetName()),
 	  m_password(), m_country(other.GetCountry()), m_avatarFile(other.GetAvatarFile()), m_avatarMD5(other.GetAvatarMD5()),
 	  m_type(other.GetType()), m_rights(other.GetRights()), m_isGameAdmin(other.IsGameAdmin()),
 	  m_netAvatarFile(), m_dataMutex()
@@ -160,6 +160,20 @@ PlayerData::SetNumber(int number)
 	m_number = number;
 }

+std::string
+PlayerData::GetGuid() const
+{
+	boost::mutex::scoped_lock lock(m_dataMutex);
+	return m_guid;
+}
+
+void
+PlayerData::SetGuid(const std::string &guid)
+{
+	boost::mutex::scoped_lock lock(m_dataMutex);
+	m_guid = guid;
+}
+
 DB_id
 PlayerData::GetDBId() const
 {