Ticket #3292: serializationChange.patch

source/simulation2/Simulation2.cpp

@@ -45 +45 @@
 
 #include <iomanip>
 
+int hashStart = 124;
+
 #if MSC_VERSION
 #include <process.h>
 #define getpid _getpid // use the non-deprecated function name
@@ -65 +67 @@
     CSimulation2Impl(CUnitManager* unitManager, shared_ptr<ScriptRuntime> rt, CTerrain* terrain) :
         m_SimContext(), m_ComponentManager(m_SimContext, rt),
         m_EnableOOSLog(false), m_EnableSerializationTest(false),
-        m_MapSettings(rt->m_rt), m_InitAttributes(rt->m_rt)
+        m_MapSettings(rt->m_rt), m_InitAttributes(rt->m_rt), secondaryComponentManager(secondaryContext, rt)
     {
         m_SimContext.m_UnitManager = unitManager;
         m_SimContext.m_Terrain = terrain;
@@ -79 +81 @@
             CFG_GET_VAL("ooslog", m_EnableOOSLog);
             CFG_GET_VAL("serializationtest", m_EnableSerializationTest);
         }
+        
+        // Initialise the secondary simulation
+        secondaryContext.m_Terrain = &secondaryTerrain;
+        secondaryComponentManager.LoadComponentTypes();
     }
 
     ~CSimulation2Impl()
@@ -134 +140 @@
     bool m_EnableOOSLog;
 
 
+    // Initialise the secondary simulation
+    CTerrain secondaryTerrain;
+    CSimContext secondaryContext;
+    CComponentManager secondaryComponentManager;
+    
+    std::set<VfsPath> secondaryLoadedScripts;
+
+
     // Functions and data for the serialization test mode: (see Update() for relevant comments)
 
     bool m_EnableSerializationTest;
@@ -346 +360 @@
     SerializationTestState primaryStateBefore;
     ScriptInterface& scriptInterface = m_ComponentManager.GetScriptInterface();
 
-    if (m_EnableSerializationTest)
+    if (m_EnableSerializationTest && m_TurnNumber == hashStart)
     {
+        ENSURE(LoadDefaultScripts(secondaryComponentManager, &secondaryLoadedScripts));
+    }
+
+    if (m_TurnNumber >= hashStart)
+    {
         ENSURE(m_ComponentManager.SerializeState(primaryStateBefore.state));
         if (serializationTestDebugDump)
             ENSURE(m_ComponentManager.DumpDebugState(primaryStateBefore.debug, false));
@@ -360 +379 @@
 
     if (m_EnableSerializationTest)
     {
-        // Initialise the secondary simulation
-        CTerrain secondaryTerrain;
-        CSimContext secondaryContext;
-        secondaryContext.m_Terrain = &secondaryTerrain;
-        CComponentManager secondaryComponentManager(secondaryContext, scriptInterface.GetRuntime());
-        secondaryComponentManager.LoadComponentTypes();
-        std::set<VfsPath> secondaryLoadedScripts;
-        ENSURE(LoadDefaultScripts(secondaryComponentManager, &secondaryLoadedScripts));
+        if (m_TurnNumber == hashStart)
+        {
         ResetComponentState(secondaryComponentManager, false, false);
 
         // Load the trigger scripts after we have loaded the simulation.
@@ -405 +418 @@
 
         LDR_EndRegistering();
         ENSURE(LDR_NonprogressiveLoad() == INFO::OK);
-
         ENSURE(secondaryComponentManager.DeserializeState(primaryStateBefore.state));
-
+        }
+        if (m_TurnNumber >= hashStart)
+        {
         SerializationTestState secondaryStateBefore;
         ENSURE(secondaryComponentManager.SerializeState(secondaryStateBefore.state));
         if (serializationTestDebugDump)
@@ -443 +457 @@
             ReportSerializationFailure(&primaryStateBefore, &primaryStateAfter, &secondaryStateBefore, &secondaryStateAfter);
         }
     }
+    }
 
 //  if (m_TurnNumber == 0)
 //      m_ComponentManager.GetScriptInterface().DumpHeap();
@@ -462 +477 @@
     else
         scriptInterface.GetRuntime()->MaybeIncrementalGC(0.0f);
 
-    if (m_EnableOOSLog)
+    if (m_EnableOOSLog && m_TurnNumber >= hashStart)
         DumpState();
 
     // Start computing AI for the next turn