Ticket #3060: aimanager.diff

source/simulation2/components/CCmpAIManager.cpp

@@ -558 +558 @@
     {
         JSContext* cx = m_ScriptInterface->GetContext();
         JSAutoRequest rq(cx);
-        
+
+        serializer.NumberU32_Unbounded("num ais", (u32)m_Players.size());
+
         std::stringstream rngStream;
         rngStream << m_RNG;
         serializer.StringASCII("rng", rngStream.str(), 0, 32);
@@ -565 +567 @@
 
         serializer.NumberU32_Unbounded("turn", m_TurnNum);
 
-        serializer.NumberU32_Unbounded("num ais", (u32)m_Players.size());
-
         serializer.Bool("useSharedScript", m_HasSharedComponent);
         if (m_HasSharedComponent)
         {
@@ -606 +606 @@
         }
     }
 
-    void Deserialize(std::istream& stream)
+    uint32_t PreDeserialize(std::istream& stream)
     {
         JSContext* cx = m_ScriptInterface->GetContext();
         JSAutoRequest rq(cx);
-        
+
         ENSURE(m_CommandsComputed); // deserializing while we're still actively computing would be bad
 
         CStdDeserializer deserializer(*m_ScriptInterface, stream);
 
+        uint32_t numAis;
+        deserializer.NumberU32_Unbounded("num ais", numAis);
+        return numAis;
+    }
+  
+    void Deserialize(std::istream& stream, uint32_t numAis)
+    {
+        JSContext* cx = m_ScriptInterface->GetContext();
+        JSAutoRequest rq(cx);
+
+        ENSURE(m_CommandsComputed); // deserializing while we're still actively computing would be bad
+
+        CStdDeserializer deserializer(*m_ScriptInterface, stream);
+
         m_PlayerMetadata.clear();
         m_Players.clear();
 
@@ -626 +640 @@
 
         deserializer.NumberU32_Unbounded("turn", m_TurnNum);
 
-        uint32_t numAis;
-        deserializer.NumberU32_Unbounded("num ais", numAis);
-
         deserializer.Bool("useSharedScript", m_HasSharedComponent);
-        TryLoadSharedComponent(false);
         if (m_HasSharedComponent)
         {
+            TryLoadSharedComponent(false);
+
             JS::RootedValue sharedData(cx);
             JS::RootedValue tmpSharedAIObj(cx, m_SharedAIObj.get()); // TODO: Check if this temporary root can be removed after SpiderMonkey 31
             deserializer.ScriptVal("sharedData", &sharedData);
@@ -853 +865 @@
     {
         Init(paramNode);
 
-        ForceLoadEntityTemplates();
+        uint32_t numAis = m_Worker.PreDeserialize(deserialize.GetStream());
+        if (numAis > 0)
+            ForceLoadEntityTemplates();
 
-        m_Worker.Deserialize(deserialize.GetStream());
+        m_Worker.Deserialize(deserialize.GetStream(), numAis);
         
         m_JustDeserialized = true;
     }