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.

src/engine/local_engine/localplayer.h

@@ -43,6 +43,15 @@ public:
 	unsigned getMyUniqueID() const {
 		return myUniqueID;
 	}
+
+	void setMyGuid(const std::string &theValue) {
+		myGuid = theValue;
+	}
+
+	std::string getMyGuid() const {
+		return myGuid;
+	}
+
 	PlayerType getMyType() const {
 		return myType;
 	}
@@ -290,6 +299,7 @@ private:
 	// Konstanten
 	int myID;
 	unsigned myUniqueID;
+	std::string myGuid;
 	PlayerType myType;
 	std::string myName;
 	std::string myAvatar;