Index: binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js =================================================================== --- binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js +++ binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js @@ -137,10 +137,7 @@ Trigger.prototype.SetDisableTemplates = function() { for (let i = 1; i < TriggerHelper.GetNumberOfPlayers(); ++i) - { - let cmpPlayer = QueryPlayerIDInterface(i); - cmpPlayer.SetDisabledTemplates(disabledTemplates(cmpPlayer.GetCiv())); - } + QueryPlayerIDInterface(i).SetDisabledTemplates(disabledTemplates(QueryPlayerIDInterface(i, IID_Identity).GetCiv())); }; /** Index: binaries/data/mods/public/maps/scripts/Regicide.js =================================================================== --- binaries/data/mods/public/maps/scripts/Regicide.js +++ binaries/data/mods/public/maps/scripts/Regicide.js @@ -5,7 +5,7 @@ let playersCivs = []; for (let playerID = 1; playerID < TriggerHelper.GetNumberOfPlayers(); ++playerID) - playersCivs[playerID] = QueryPlayerIDInterface(playerID).GetCiv(); + playersCivs[playerID] = QueryPlayerIDInterface(playerID, IID_Identity).GetCiv(); // Get all hero templates of these civs let heroTemplates = {}; Index: binaries/data/mods/public/simulation/ai/common-api/shared.js =================================================================== --- binaries/data/mods/public/simulation/ai/common-api/shared.js +++ binaries/data/mods/public/simulation/ai/common-api/shared.js @@ -52,7 +52,7 @@ m.SharedScript.prototype.GetTemplate = function(name) { if (this._templates[name] === undefined) - this._templates[name] = Engine.GetTemplate(name) || null; + this._templates[name] = SimEngine.GetTemplate(name) || null; return this._templates[name]; }; Index: source/gui/GUIManager.h =================================================================== --- source/gui/GUIManager.h +++ source/gui/GUIManager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2022 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -119,11 +119,6 @@ bool TemplateExists(const std::string& templateName) const; /** - * Retrieve the requested template, used for displaying faction specificities. - */ - const CParamNode& GetTemplate(const std::string& templateName); - - /** * Display progress / description in loading screen. */ void DisplayLoadProgress(int percent, const wchar_t* pending_task); Index: source/gui/GUIManager.cpp =================================================================== --- source/gui/GUIManager.cpp +++ source/gui/GUIManager.cpp @@ -397,15 +397,6 @@ return m_TemplateLoader.TemplateExists(templateName); } -const CParamNode& CGUIManager::GetTemplate(const std::string& templateName) -{ - const CParamNode& templateRoot = m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity"); - if (!templateRoot.IsOk()) - LOGERROR("Invalid template found for '%s'", templateName.c_str()); - - return templateRoot; -} - void CGUIManager::DisplayLoadProgress(int percent, const wchar_t* pending_task) { const ScriptInterface& scriptInterface = *(GetActiveGUI()->GetScriptInterface()); Index: source/gui/Scripting/JSInterface_GUIManager.cpp =================================================================== --- source/gui/Scripting/JSInterface_GUIManager.cpp +++ source/gui/Scripting/JSInterface_GUIManager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2022 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -68,11 +68,6 @@ return g_GUI->TemplateExists(templateName); } -CParamNode GetTemplate(const std::string& templateName) -{ - return g_GUI->GetTemplate(templateName); -} - void RegisterScriptFunctions(const ScriptRequest& rq) { @@ -82,7 +77,6 @@ ScriptFunction::Register<&SetCursor>(rq, "SetCursor"); ScriptFunction::Register<&ResetCursor>(rq, "ResetCursor"); ScriptFunction::Register<&TemplateExists>(rq, "TemplateExists"); - ScriptFunction::Register<&GetTemplate>(rq, "GetTemplate"); ScriptFunction::Register<&CGUI::FindObjectByName, &ScriptInterface::ObjectFromCBData>(rq, "GetGUIObjectByName"); ScriptFunction::Register<&CGUI::SetGlobalHotkey, &ScriptInterface::ObjectFromCBData>(rq, "SetGlobalHotkey"); Index: source/simulation2/components/CCmpAIManager.cpp =================================================================== --- source/simulation2/components/CCmpAIManager.cpp +++ source/simulation2/components/CCmpAIManager.cpp @@ -30,7 +30,6 @@ #include "ps/Filesystem.h" #include "ps/Profile.h" #include "ps/scripting/JSInterface_VFS.h" -#include "ps/TemplateLoader.h" #include "ps/Util.h" #include "scriptinterface/FunctionWrapper.h" #include "scriptinterface/ScriptContext.h" @@ -266,7 +265,6 @@ REGISTER_FUNC_NAME(ComputePathScript, "ComputePath"); REGISTER_FUNC_NAME(DumpImage, "DumpImage"); - REGISTER_FUNC_NAME(GetTemplate, "GetTemplate"); #undef REGISTER_FUNC_NAME @@ -350,13 +348,6 @@ waypoints.emplace_back(wp.x, wp.z); } - CParamNode GetTemplate(const std::string& name) - { - if (!m_TemplateLoader.TemplateExists(name)) - return CParamNode(false); - return m_TemplateLoader.GetTemplateFileData(name).GetChild("Entity"); - } - /** * Debug function for AI scripts to dump 2D array data (e.g. terrain tile weights). */ @@ -859,8 +850,6 @@ LongPathfinder m_LongPathfinder; bool m_CommandsComputed; - - CTemplateLoader m_TemplateLoader; }; Index: source/simulation2/scripting/JSInterface_Simulation.cpp =================================================================== --- source/simulation2/scripting/JSInterface_Simulation.cpp +++ source/simulation2/scripting/JSInterface_Simulation.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2022 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -32,10 +32,12 @@ #include "simulation2/components/ICmpObstruction.h" #include "simulation2/components/ICmpPosition.h" #include "simulation2/components/ICmpSelectable.h" +#include "simulation2/components/ICmpTemplateManager.h" #include "simulation2/helpers/Geometry.h" #include "simulation2/helpers/Selection.h" #include "simulation2/Simulation2.h" #include "simulation2/system/Entity.h" +#include "simulation2/system/ParamNode.h" #include #include @@ -87,6 +89,28 @@ g_Game->GetSimulation2()->DumpDebugState(file); } +CParamNode GetTemplate(const std::string& templateName) +{ + if (!g_Game) + { + const CParamNode templateRoot = m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity"); + if (templateRoot.IsOk()) + return templateRoot; + + LOGERROR("Invalid template found for '%s'.", templateName.c_str()); + return CParamNode(false); + } + + CSimulation2* sim = g_Game->GetSimulation2(); + ENSURE(sim); + + CmpPtr cmpTemplateManager(*sim, SYSTEM_ENTITY); + if (!cmpTemplateManager) + return CParamNode(false); + + return cmpTemplateManager->GetTemplate(templateName); +} + entity_id_t PickEntityAtPoint(int x, int y) { return EntitySelection::PickEntityAtPoint(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), x, y, g_Game->GetViewedPlayerID(), false); @@ -211,6 +235,7 @@ ScriptFunction::Register<&PostNetworkCommand>(rq, "PostNetworkCommand"); ScriptFunction::Register<&DumpSimState>(rq, "DumpSimState"); ScriptFunction::Register<&GetAIs>(rq, "GetAIs"); + ScriptFunction::Register<&GetTemplate>(rq, "GetTemplate"); ScriptFunction::Register<&PickEntityAtPoint>(rq, "PickEntityAtPoint"); ScriptFunction::Register<&PickPlayerEntitiesInRect>(rq, "PickPlayerEntitiesInRect"); ScriptFunction::Register<&PickPlayerEntitiesOnScreen>(rq, "PickPlayerEntitiesOnScreen");