Ticket #3409: t3409_getPlayerGUID_v1.patch

source/gui/scripting/ScriptFunctions.cpp

@@ -191 +191 @@
     if (g_Game)
         return g_Game->GetPlayerID();
     return -1;
 }
 
+CStr GetPlayerGUID(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
+{
+    if (g_NetServer)
+        return g_NetServer->GetHostGUID();
+    else if (g_NetClient)
+        return g_NetClient->GetGUID();
+
+    return "";
+}
+
 void SetPlayerID(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), int id)
 {
     if (g_Game)
         g_Game->SetPlayerID(id);
 }
@@ -963 +973 @@
     scriptInterface.RegisterFunction<void, &DisconnectNetworkGame>("DisconnectNetworkGame");
     scriptInterface.RegisterFunction<JS::Value, &PollNetworkClient>("PollNetworkClient");
     scriptInterface.RegisterFunction<void, JS::HandleValue, &SetNetworkGameAttributes>("SetNetworkGameAttributes");
     scriptInterface.RegisterFunction<void, int, std::string, &AssignNetworkPlayer>("AssignNetworkPlayer");
     scriptInterface.RegisterFunction<void, std::string, int, &SetNetworkPlayerStatus>("SetNetworkPlayerStatus");
+    scriptInterface.RegisterFunction<CStr, &GetPlayerGUID>("GetPlayerGUID");
     scriptInterface.RegisterFunction<void, &ClearAllPlayerReady>("ClearAllPlayerReady");
     scriptInterface.RegisterFunction<void, std::wstring, &SendNetworkChat>("SendNetworkChat");
     scriptInterface.RegisterFunction<void, int, &SendNetworkReady>("SendNetworkReady");
     scriptInterface.RegisterFunction<void, &SendNetworkRejoined>("SendNetworkRejoined");
     scriptInterface.RegisterFunction<JS::Value, &GetAIs>("GetAIs");

source/network/NetClient.h

@@ -87 +87 @@
      * This must not be called after the connection setup.
      */
     void SetUserName(const CStrW& username);
 
     /**
+     * Returns the GUID of the client.
+     */
+    CStr GetGUID() const { return m_GUID; }
+
+    /**
      * Set up a connection to the remote networked server.
      * @param server IP address or host name to connect to
      * @return true on success, false on connection failure
      */
     bool SetupConnection(const CStr& server);

source/network/NetServer.cpp

@@ -615 +615 @@
 
 void CNetServerWorker::OnUserJoin(CNetServerSession* session)
 {
     AddPlayer(session->GetGUID(), session->GetUserName());
 
+    if (m_HostGUID.empty())
+        m_HostGUID = session->GetGUID();
+
     CGameSetupMessage gameSetupMessage(GetScriptInterface());
     gameSetupMessage.m_Data = m_GameAttributes.get();
     session->SendMessage(&gameSetupMessage);
 
     CPlayerAssignmentMessage assignMessage;
@@ -1159 +1162 @@
 {
     CScopeLock lock(m_Worker->m_WorkerMutex);
     m_Worker->m_PlayerReadyQueue.emplace_back(guid, ready);
 }
 
+CStr CNetServer::GetHostGUID()
+{
+    CScopeLock lock(m_Worker->m_WorkerMutex);
+    return m_Worker->GetHostGUID();
+}
+
 void CNetServer::ClearAllPlayerReady()
 {
     CScopeLock lock(m_Worker->m_WorkerMutex);
     m_Worker->m_PlayerResetReadyQueue.push_back(false);
 }

source/network/NetServer.h

@@ -132 +132 @@
     /**
      * Call from the GUI to set the all player readiness to 0.
      * The changes will be asynchronously propagated to all clients.
      */
     void ClearAllPlayerReady();
-    
+
+    /**
+     * Returns the GUID of the host.
+    */
+    CStr GetHostGUID();
+
     /**
      * Call from the GUI to asynchronously notify all clients that they should start loading the game.
      */
     void StartGame();
 
@@ -186 +191 @@
      * Send a message to all clients who have completed the full connection process
      * (i.e. are in the pre-game or in-game states).
      */
     bool Broadcast(const CNetMessage* message);
 
+    CStr GetHostGUID() const { return m_HostGUID; }
+
 private:
     friend class CNetServer;
     friend class CNetFileReceiveTask_ServerRejoin;
 
     CNetServerWorker(int autostartPlayers);
@@ -301 +308 @@
 
     u32 m_NextHostID;
 
     CNetServerTurnManager* m_ServerTurnManager;
 
+    CStr m_HostGUID;
+
     /**
      * A copy of all simulation commands received so far, indexed by
      * turn number, to simplify support for rejoining etc.
      * TODO: verify this doesn't use too much RAM.
      */