Ticket #4087: replay_visual.patch

binaries/data/mods/public/gui/session/session.js

@@ -224 +224 @@
         Engine.SwitchGuiPage("page_pregame.xml");
         return;
     }
+        g_GameAttributes = Engine.GetInitAttributes();
 
     if (initData)
     {
@@ -230 +231 @@
         g_IsNetworked = initData.isNetworked;
         g_IsController = initData.isController;
         g_PlayerAssignments = initData.playerAssignments;
-        g_GameAttributes = initData.attribs;
         g_ReplaySelectionData = initData.replaySelectionData;
         g_HasRejoined = initData.isRejoining;
 

source/gui/scripting/ScriptFunctions.cpp

@@ -510 +510 @@
     return settings;
 }
 
+JS::Value GetInitAttributes(ScriptInterface::CxPrivate* pCxPrivate)
+{
+    if (!g_Game)
+        return JS::UndefinedValue();
+
+    JSContext* cx = g_Game->GetSimulation2()->GetScriptInterface().GetContext();
+    JSAutoRequest rq(cx);
+
+    JS::RootedValue initAttribs(cx);
+    g_Game->GetSimulation2()->GetInitAttributes(&initAttribs);
+    return pCxPrivate->pScriptInterface->CloneValueFromOtherContext(
+        g_Game->GetSimulation2()->GetScriptInterface(),
+        initAttribs);
+}
+
 /**
  * Get the current X coordinate of the camera.
  */
@@ -1055 +1070 @@
     scriptInterface.RegisterFunction<bool, &AtlasIsAvailable>("AtlasIsAvailable");
     scriptInterface.RegisterFunction<bool, &IsAtlasRunning>("IsAtlasRunning");
     scriptInterface.RegisterFunction<JS::Value, VfsPath, &LoadMapSettings>("LoadMapSettings");
+    scriptInterface.RegisterFunction<JS::Value, &GetInitAttributes>("GetInitAttributes");
     scriptInterface.RegisterFunction<float, &CameraGetX>("CameraGetX");
     scriptInterface.RegisterFunction<float, &CameraGetZ>("CameraGetZ");
     scriptInterface.RegisterFunction<void, entity_id_t, &CameraFollow>("CameraFollow");

source/simulation2/Simulation2.cpp

@@ -748 +748 @@
     return m->m_InitAttributes.get();
 }
 
+void CSimulation2::GetInitAttributes(JS::MutableHandleValue ret)
+{
+    ret.set(m->m_InitAttributes);
+}
+
 void CSimulation2::SetMapSettings(const std::string& settings)
 {
     m->m_ComponentManager.GetScriptInterface().ParseJSON(settings, &m->m_MapSettings);

source/simulation2/Simulation2.h

@@ -103 +103 @@
      * Get the data passed to SetInitAttributes.
      */
     JS::Value GetInitAttributes();
+    void GetInitAttributes(JS::MutableHandleValue ret);
 
     /**
      * Set the initial map settings (as a UTF-8-encoded JSON string),