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/session.cpp

@@ -112,7 +112,9 @@ void Session::startLocalGame(const GameData &gameData, const StartData &startDat
 
 		//PlayerData erzeugen
 		// UniqueId = PlayerNumber for local games.
-		boost::shared_ptr<PlayerData> playerData(new PlayerData(i, i,
+		boost::shared_ptr<PlayerData> playerData(new PlayerData(
+				i,
+				i,
 				i == 0 ? PLAYER_TYPE_HUMAN : PLAYER_TYPE_COMPUTER,
 				PLAYER_RIGHTS_NORMAL,
 				i == 0));