Ticket #3309: t3309_cap_expected_simTime_v3_for_replays.patch

source/network/NetTurnManager.cpp

@@ -98 +98 @@
         return false;
 
     return true;
 }
 
-bool CNetTurnManager::Update(float simFrameLength, size_t maxTurns)
+bool CNetTurnManager::Update(float simFrameLength, size_t maxTurns, bool isVisualReplay)
 {
     m_DeltaSimTime += simFrameLength;
 
+    // If the game runs slower than the game speed dictates, m_DeltaSimTime increases progressively.
+    // The engine will try to fast forward accordingly to catch up.
+    // TODO: We fix it for replays until we are certain that it works for multiplayer too.
+    // There is be no difference between singleplayer and replays.
+    if (isVisualReplay)
+        m_DeltaSimTime = std::min(m_DeltaSimTime, simFrameLength);
+
     // If we haven't reached the next turn yet, do nothing
     if (m_DeltaSimTime < 0)
         return false;
 
     NETTURN_LOG((L"Update current=%d ready=%d\n", m_CurrentTurn, m_ReadyTurn));

source/network/NetTurnManager.h

@@ -76 +76 @@
      * Otherwise, nothing happens and it returns false.
      * 
      * @param simFrameLength Length of the previous frame, in simulation seconds
      * @param maxTurns Maximum number of turns to simulate at once
      */
-    bool Update(float simFrameLength, size_t maxTurns);
+    bool Update(float simFrameLength, size_t maxTurns, bool isVisualReplay = false);
 
     /**
      * Advance the simulation by as much as possible. Intended for catching up
      * over a small number of turns when rejoining a multiplayer match.
      * Returns true if it advanced by at least one turn.

source/ps/Game.cpp

@@ -381 +381 @@
         // frame per simulation turn, so let maxTurns be 1. But for fast-forward
         // sim rates we want to allow more, so it's not bounded by framerate,
         // so just use the sim rate itself as the number of turns per frame.
         size_t maxTurns = (size_t)m_SimRate;
 
-        if (m_TurnManager->Update(deltaSimTime, maxTurns))
+        if (m_TurnManager->Update(deltaSimTime, maxTurns, m_IsVisualReplay))
         {
             {
                 PROFILE3("gui sim update");
                 g_GUI->SendEventToAll("SimulationUpdate");
             }