Ticket #3309: t3309_fix_very_fast_forward_v1.patch

binaries/data/mods/public/simulation/data/game_speeds.json

@@ -22 +22 @@
             "Speed": 1.0,
             "Default": true
         },
         {
             "Name": "Fast (1.25x)",
-            "Speed": 1.25
+            "Speed": 10
         },
         {
             "Name": "Very Fast (1.5x)",
-            "Speed": 1.5
+            "Speed": 15
         },
         {
             "Name": "Insane (2x)",
-            "Speed": 2.0
+            "Speed": 20
         }
     ]
 }

source/network/NetTurnManager.cpp

@@ -69 +69 @@
     // So they can be sending us commands scheduled for n+1, n+2, n+3.
     // So we need a 3-element buffer:
     m_QueuedCommands.resize(COMMAND_DELAY + 1);
 }
 
+void CNetTurnManager::ResetDeltaSimTime()
+{
+    m_DeltaSimTime = 0;
+    m_ReadyTurn = m_CurrentTurn + 1;
+}
 void CNetTurnManager::ResetState(u32 newCurrentTurn, u32 newReadyTurn)
 {
     m_CurrentTurn = newCurrentTurn;
     m_ReadyTurn = newReadyTurn;
     m_DeltaSimTime = 0;

source/network/NetTurnManager.h

@@ -60 +60 @@
      */
     CNetTurnManager(CSimulation2& simulation, u32 defaultTurnLength, int clientId, IReplayLogger& replay);
 
     virtual ~CNetTurnManager() { }
 
+    /**
+     * Called when changing the simulation rate. Stops the simulation from trying to keep up with
+     * too high fast forward speeds, so that the simulation rate will be changed immediately.
+     */
+    void ResetDeltaSimTime();
+
     void ResetState(u32 newCurrentTurn, u32 newReadyTurn);
 
     /**
      * Set the current user's player ID, which will be added into command messages.
      */

source/ps/Game.cpp

@@ -256 +256 @@
         RegMemFun(this, &CGame::LoadReplayData, L"Loading replay data", 1000);
 
     LDR_EndRegistering();
 }
 
+void CGame::SetSimRate(float simRate)
+{
+    if (isfinite(simRate))
+    {
+        m_SimRate = std::max(simRate, 0.0f);
+        m_TurnManager->ResetDeltaSimTime();
+    }
+}
+
 int CGame::LoadInitialState()
 {
     ENSURE(m_IsSavedGame);
     ENSURE(!m_InitialSavedState.empty());
 

source/ps/Game.h

@@ -137 +137 @@
      * @return CSimulation2 * the value of m_Simulation2.
      **/
     inline CSimulation2 *GetSimulation2()
     {   return m_Simulation2; }
 
+
+    inline float GetSimRate()
+    {   return m_SimRate; }
+
     /**
      * Set the simulation scale multiplier.
      *
      * @param simRate Float value to set m_SimRate to.
      *                      Because m_SimRate is also used to
      *                      scale TimeSinceLastFrame it must be
      *                      clamped to 0.0f.
      **/
-    inline void SetSimRate(float simRate)
-    {   if (isfinite(simRate)) m_SimRate = std::max(simRate, 0.0f); }
-
-    inline float GetSimRate()
-    {   return m_SimRate; }
+    void SetSimRate(float simRate);
 
     /**
      * Replace the current turn manager.
      * This class will take ownership of the pointer.
      */