Ticket #3060: aimanager2.diff

source/simulation2/components/CCmpAIManager.cpp

@@ -1 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -558 +558 @@
     {
         JSContext* cx = m_ScriptInterface->GetContext();
         JSAutoRequest rq(cx);
-        
+
         std::stringstream rngStream;
         rngStream << m_RNG;
         serializer.StringASCII("rng", rngStream.str(), 0, 32);
 
         serializer.NumberU32_Unbounded("turn", m_TurnNum);
 
-        serializer.NumberU32_Unbounded("num ais", (u32)m_Players.size());
-
         serializer.Bool("useSharedScript", m_HasSharedComponent);
         if (m_HasSharedComponent)
         {
@@ -606 +604 @@
         }
     }
 
-    void Deserialize(std::istream& stream)
+    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);
@@ -626 +624 @@
 
         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);
@@ -841 +837 @@
 
     virtual void Serialize(ISerializer& serialize)
     {
+        serialize.NumberU32_Unbounded("num ais", m_Worker.getPlayerSize());
+
         // Because the AI worker uses its own ScriptInterface, we can't use the
         // ISerializer (which was initialised with the simulation ScriptInterface)
         // directly. So we'll just grab the ISerializer's stream and write to it
@@ -853 +851 @@
     {
         Init(paramNode);
 
-        ForceLoadEntityTemplates();
+        uint32_t numAis;
+        deserialize.NumberU32_Unbounded("num ais", numAis);
+        if (numAis > 0)
+            ForceLoadEntityTemplates();
 
-        m_Worker.Deserialize(deserialize.GetStream());
+        m_Worker.Deserialize(deserialize.GetStream(), numAis);
         
         m_JustDeserialized = true;
     }