dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

JS GUI session cleanup.

Browse source 
Load technologies through the globalscript from D1108 / c90d72deb5
rather than querying the simulation for that.
Same can be done for auras afterwards.

This was SVN commit r20756.
This commit is contained in:
elexis 2018-01-02 21:50:41 +00:00
parent 56f4e13c9d
commit bc2c9c1939
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
binaries/data/mods/public/gui/session/session.js
View file

@ -242,7 +242,7 @@ function GetTechnologyData(technologyName, civ)
if (!(technologyName in g_TechnologyData[civ]))
{
let template = Engine.GuiInterfaceCall("GetTechnologyData", { "name": technologyName, "civ": civ });
let template = GetTechnologyDataHelper(TechnologyTemplates.Get(technologyName), civ, g_ResourceData);
translateObjectKeys(template, ["specific", "generic", "description", "tooltip", "requirementsTooltip"]);
g_TechnologyData[civ][technologyName] = deepfreeze(template);
}
@ -275,6 +275,8 @@ function init(initData, hotloadData)
else if (g_IsReplay)// Needed for autostart loading option
g_PlayerAssignments.local.player = -1;
LoadModificationTemplates();
updatePlayerData();
g_BarterSell = g_ResourceData.GetCodes()[0];

6
binaries/data/mods/public/simulation/components/GuiInterface.js
View file

@ -651,11 +651,6 @@ GuiInterface.prototype.GetTemplateData = function(player, name)
return GetTemplateDataHelper(template, player, aurasTemplate, Resources, DamageTypes);
};
GuiInterface.prototype.GetTechnologyData = function(player, data)
{
return GetTechnologyDataHelper(TechnologyTemplates.Get(data.name), data.civ, Resources);
};
GuiInterface.prototype.IsTechnologyResearched = function(player, data)
{
if (!data.tech)
@ -1967,7 +1962,6 @@ let exposedFunctions = {
"GetExtendedEntityState": 1,
"GetAverageRangeForBuildings": 1,
"GetTemplateData": 1,
"GetTechnologyData": 1,
"IsTechnologyResearched": 1,
"CheckTechnologyRequirements": 1,
"GetStartedResearch": 1,