Ticket #2420: sendNetworkMessagesAtGameEnd_v1.patch

source/network/NetClient.cpp

@@ -147 +147 @@
     SAFE_DELETE(m_Session);
 }
 
+void CNetClient::OnGameEnd()
+{
+    // send network messages of current frame before connection get's destroyed
+    if (m_ClientTurnManager)
+    {
+        m_ClientTurnManager->OnDestroyConnection(); // end sending commands for scheduled turn
+        Flush(); // make sure the messages are send
+    }
+}
+
 void CNetClient::Poll()
 {
     if (m_Session)

source/network/NetClient.h

@@ -164 +164 @@
     void LoadFinished();
 
     void SendChatMessage(const std::wstring& text);
+    
+    /**
+     * sends the commands of the current turn to the server and tells the server that there will be no more messages in this turn.
+     * should only be called once before the client disconnects 
+     * (putting this in destructor  is too late)
+     */
+    void OnGameEnd();
 
 private:
     // Net message / FSM transition handlers

source/network/NetTurnManager.cpp

@@ -419 +419 @@
     m_NetClient.SendMessage(&msg);
 }
 
+void CNetClientTurnManager::OnDestroyConnection()
+{
+    NotifyFinishedOwnCommands(m_CurrentTurn + COMMAND_DELAY);
+}
+
 void CNetClientTurnManager::OnSimulationMessage(CSimulationMessage* msg)
 {
     // Command received from the server - store it for later execution

source/network/NetTurnManager.h

@@ -200 +200 @@
     virtual void OnSimulationMessage(CSimulationMessage* msg);
 
     virtual void PostCommand(CScriptValRooted data);
+    
+    /**
+     * notifiy the server that all commands for the scheduled turn are send before the connection is destroyed
+     */
+    void OnDestroyConnection();
 
 protected:
     virtual void NotifyFinishedOwnCommands(u32 turn);

source/ps/GameSetup/GameSetup.cpp

@@ -654 +654 @@
 
 void EndGame()
 {
+    // make sure that the messages last messages are sent
+    if (g_NetClient)
+        g_NetClient->OnGameEnd();
+        
     SAFE_DELETE(g_NetServer);
     SAFE_DELETE(g_NetClient);
     SAFE_DELETE(g_Game);