Ticket #3143: 3143_lobby_data_gameattribs.patch

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

@@ -622 +622 @@
         "timeElapsed" : extendedSimState.timeElapsed,
         "playerStates": extendedSimState.players,
         "players": g_Players,
-        "mapSettings": Engine.GetMapSettings(),
+        "mapSettings": g_GameAttributes.settings,
         "isInGame": true,
         "gameResult": translate("Current Scores"),
         "callback": "resumeGame"

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

@@ -64 +64 @@
 var g_FollowPlayer = false;
 
 /**
- * Unique ID for lobby reports.
- */
-var g_MatchID;
-
-/**
  * Cache the basic player data (name, civ, color).
  */
 var g_Players = [];
@@ -96 +91 @@
     }
 };
 
+var g_GameAttributes;
+
 /**
  * Cache dev-mode settings that are frequently or widely used.
  */
@@ -230 +227 @@
         g_IsNetworked = initData.isNetworked;
         g_IsController = initData.isController;
         g_PlayerAssignments = initData.playerAssignments;
-        g_MatchID = initData.attribs.matchID;
+        g_GameAttributes = initData.attribs;
         g_ReplaySelectionData = initData.replaySelectionData;
         g_HasRejoined = initData.isRejoining;
 
@@ -485 +482 @@
 
 function reportPerformance(time)
 {
-    let settings = Engine.GetMapSettings();
+    let settings = g_GameAttributes.settings;
     Engine.SubmitUserReport("profile", 3, JSON.stringify({
         "time": time,
         "map": settings.Name,
@@ -526 +523 @@
     let simData = {
         "timeElapsed" : extendedSimState.timeElapsed,
         "playerStates": extendedSimState.players,
-        "mapSettings": Engine.GetMapSettings()
+        "mapSettings": g_GameAttributes.settings
     };
 
     if (!g_IsReplay)
@@ -1222 +1219 @@
     playerStatistics.feminisation = "";
     playerStatistics.percentMapExplored = "";
 
-    let mapName = Engine.GetMapSettings().Name;
+    let mapName = g_GameAttributes.settings.Name;
     let playerStates = "";
     let playerCivs = "";
     let teams = "";
@@ -1272 +1269 @@
     reportObject.timeElapsed = extendedSimState.timeElapsed;
     reportObject.playerStates = playerStates;
     reportObject.playerID = Engine.GetPlayerID();
-    reportObject.matchID = g_MatchID;
+    reportObject.matchID = g_GameAttributes.matchID;
     reportObject.civs = playerCivs;
     reportObject.teams = teams;
     reportObject.teamsLocked = String(teamsLocked);

source/gui/scripting/ScriptFunctions.cpp

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