Ticket #4199: Simulation2.cpp.patch

source/simulation2/Simulation2.cpp

@@ -51 +51 @@
 public:
     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_EnableOOSLog(false), m_EnableSerializationTest(false), m_InitAttributes(rt->m_rt)
     {
         m_SimContext.m_UnitManager = unitManager;
         m_SimContext.m_Terrain = terrain;
@@ -118 +117 @@
 
     std::string m_StartupScript;
     JS::PersistentRootedValue m_InitAttributes;
-    JS::PersistentRootedValue m_MapSettings;
 
     std::set<VfsPath> m_LoadedScripts;
 
@@ -364 +362 @@
         ENSURE(LoadDefaultScripts(secondaryComponentManager, &secondaryLoadedScripts));
         ResetComponentState(secondaryComponentManager, false, false);
 
+        JSContext* cx = scriptInterface.GetContext();
+        JSAutoRequest rq(cx);
+        JS::RootedValue mapSettings(cx);
+        scriptInterface.GetProperty(m_InitAttributes, "settings", &mapSettings);
         // Load the trigger scripts after we have loaded the simulation.
         {
             JSContext* cx2 = secondaryComponentManager.GetScriptInterface().GetContext();
@@ -370 +372 @@
             JSAutoRequest rq2(cx2);
             JS::RootedValue mapSettingsCloned(cx2,
                 secondaryComponentManager.GetScriptInterface().CloneValueFromOtherContext(
-                    scriptInterface, m_MapSettings));
+                scriptInterface, mapSettings));
             ENSURE(LoadTriggerScripts(secondaryComponentManager, mapSettingsCloned, &secondaryLoadedScripts));
         }
 
@@ -746 +748 @@
 
 void CSimulation2::SetMapSettings(const std::string& settings)
 {
-    m->m_ComponentManager.GetScriptInterface().ParseJSON(settings, &m->m_MapSettings);
+    ScriptInterface& scriptInterface = m->m_ComponentManager.GetScriptInterface();
+    JSContext* cx = scriptInterface.GetContext();
+    JSAutoRequest rq(cx);
+    JS::RootedValue mapSettings(cx);
+
+    scriptInterface.ParseJSON(settings, &mapSettings);
+    scriptInterface.SetProperty(m->m_InitAttributes, "settings", mapSettings);
 }
 
 void CSimulation2::SetMapSettings(JS::HandleValue settings)
 {
-    m->m_MapSettings = settings;
+    ScriptInterface& scriptInterface = m->m_ComponentManager.GetScriptInterface();
+    scriptInterface.SetProperty(m->m_InitAttributes, "settings", settings);
 
     u32 seed = 0;
-    if (!m->m_ComponentManager.GetScriptInterface().GetProperty(m->m_MapSettings, "Seed", seed))
+    if (!scriptInterface.GetProperty(settings, "Seed", seed))
         LOGWARNING("CSimulation2::SetInitAttributes: No seed value specified - using %d", seed);
 
     m->m_ComponentManager.SetRNGSeed(seed);
@@ -762 +771 @@
 
 std::string CSimulation2::GetMapSettingsString()
 {
-    return m->m_ComponentManager.GetScriptInterface().StringifyJSON(&m->m_MapSettings);
+    ScriptInterface& scriptInterface = m->m_ComponentManager.GetScriptInterface();
+    JSContext* cx = scriptInterface.GetContext();
+    JSAutoRequest rq(cx);
+    JS::RootedValue mapSettings(cx);
+    GetMapSettings(&mapSettings);
+    return scriptInterface.StringifyJSON(&mapSettings);
 }
 
 void CSimulation2::GetMapSettings(JS::MutableHandleValue ret)
 {
-    ret.set(m->m_MapSettings);
+    m->m_ComponentManager.GetScriptInterface().GetProperty(m->m_InitAttributes, "settings", ret);
 }
 
 void CSimulation2::LoadPlayerSettings(bool newPlayers)
@@ -774 +788 @@
 {
     JSContext* cx = GetScriptInterface().GetContext();
     JSAutoRequest rq(cx);
+    JS::RootedValue mapSettings(cx);
+    GetMapSettings(&mapSettings);
     JS::RootedValue global(cx, GetScriptInterface().GetGlobalObject());
-    GetScriptInterface().CallFunctionVoid(global, "LoadPlayerSettings", m->m_MapSettings, newPlayers);
+    GetScriptInterface().CallFunctionVoid(global, "LoadPlayerSettings", mapSettings, newPlayers);
 }
 
 void CSimulation2::LoadMapSettings()
@@ -782 +798 @@
 {
     JSContext* cx = GetScriptInterface().GetContext();
     JSAutoRequest rq(cx);
+    JS::RootedValue mapSettings(cx);
+    GetMapSettings(&mapSettings);
 
     JS::RootedValue global(cx, GetScriptInterface().GetGlobalObject());
 
     // Initialize here instead of in Update()
-    GetScriptInterface().CallFunctionVoid(global, "LoadMapSettings", m->m_MapSettings);
+    GetScriptInterface().CallFunctionVoid(global, "LoadMapSettings", mapSettings);
 
     if (!m->m_StartupScript.empty())
         GetScriptInterface().LoadScript(L"map startup script", m->m_StartupScript);
 
     // Load the trigger scripts after we have loaded the simulation and the map.
-    m->LoadTriggerScripts(m->m_ComponentManager, m->m_MapSettings, &m->m_LoadedScripts);
+    m->LoadTriggerScripts(m->m_ComponentManager, mapSettings, &m->m_LoadedScripts);
 }
 
 int CSimulation2::ProgressiveLoad()