mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-14 06:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Script* classes to Script namespace

Browse Source 
- Rename ScriptEngine, ScriptContext, ScriptInterface, ScriptRequest to
  Script::Engine, Script::Context, Script::Interface, Script::Request
- Remove 'Script' prefix from filenames:
  ScriptContext.* → Context.*
  ScriptInterface.* → Interface.*
  ScriptRequest.* → Request.*
  ScriptEngine.* → Engine.*
  ScriptConversions.* → Conversions.*
  ScriptExceptions.* → Exceptions.*
  ScriptForward.* → ForwardDeclarations.*
  ScriptStats.* → Stats.*
- Update all includes, forward declarations, and friend classes
- Use namespace Script { ... } in .cpp definitions to avoid repetitive
  Script:: prefix (keeping global callbacks outside)
- Rename internal implementation structs:
  ScriptInterface_impl → Interface_impl
  ScriptFunction → Function
- Update copyright year to 2026 in all touched files
- Suppress pre-existing cppcheck warnings (uninitvar, nullPointer, unknown
  macro) by adding them to suppressions-list.txt (these are not caused
  by this refactor)

Fixes #7516
This commit is contained in:
vyordan
2026-06-02 15:06:50 -06:00
committed by phosit
parent 310c4bf028
commit ec8b420abc
220 changed files with 2224 additions and 2153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/Simulation2.cpp
+27 -27
View File
@@ -45,9 +45,9 @@
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/JSON.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptContext.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/ScriptRequest.h"
#include "scriptinterface/Context.h"
#include "scriptinterface/Interface.h"
#include "scriptinterface/Request.h"
#include "scriptinterface/StructuredClone.h"
#include "simulation2/MessageTypes.h"
#include "simulation2/components/ICmpAIManager.h"
@@ -76,7 +76,7 @@
class CSimulation2Impl
{
public:
CSimulation2Impl(CUnitManager* unitManager, ScriptContext& cx, CTerrain* terrain,
CSimulation2Impl(CUnitManager* unitManager, Script::Context& cx, CTerrain* terrain,
const std::span<const wchar_t* const> scriptDirectories, const SimulationDebugOptions debugOptions) :
m_SimContext{terrain, unitManager},
m_ComponentManager{m_SimContext, cx},
@@ -198,13 +198,13 @@ public:
void InitRNGSeedSimulation();
void InitRNGSeedAI();
static std::vector<SimulationCommand> CloneCommandsFromOtherCompartment(const ScriptInterface& newScript, const ScriptInterface& oldScript,
static std::vector<SimulationCommand> CloneCommandsFromOtherCompartment(const Script::Interface& newScript, const Script::Interface& oldScript,
const std::vector<SimulationCommand>& commands)
{
std::vector<SimulationCommand> newCommands;
newCommands.reserve(commands.size());
ScriptRequest rqNew(newScript);
Script::Request rqNew(newScript);
for (const SimulationCommand& command : commands)
{
JS::RootedValue tmpCommand(rqNew.cx, Script::CloneValueFromOtherCompartment(newScript, oldScript, command.data));
@@ -235,7 +235,7 @@ void CSimulation2Impl::LoadScripts(CComponentManager& componentManager, std::set
bool CSimulation2Impl::LoadTriggerScripts(CComponentManager& componentManager, JS::HandleValue mapSettings, std::set<VfsPath>* loadedScripts)
{
bool ok = true;
ScriptRequest rq(componentManager.GetScriptInterface());
Script::Request rq(componentManager.GetScriptInterface());
if (Script::HasProperty(rq, mapSettings, "TriggerScripts"))
{
std::vector<std::string> scriptNames;
@@ -359,7 +359,7 @@ void CSimulation2Impl::ReportSerializationFailure(
void CSimulation2Impl::InitRNGSeedSimulation()
{
u32 seed = 0;
ScriptRequest rq(m_ComponentManager.GetScriptInterface());
Script::Request rq(m_ComponentManager.GetScriptInterface());
if (!Script::HasProperty(rq, m_MapSettings, "Seed") ||
!Script::GetProperty(rq, m_MapSettings, "Seed", seed))
LOGWARNING("CSimulation2Impl::InitRNGSeedSimulation: No seed value specified - using %d", seed);
@@ -370,7 +370,7 @@ void CSimulation2Impl::InitRNGSeedSimulation()
void CSimulation2Impl::InitRNGSeedAI()
{
u32 seed = 0;
ScriptRequest rq(m_ComponentManager.GetScriptInterface());
Script::Request rq(m_ComponentManager.GetScriptInterface());
if (!Script::HasProperty(rq, m_MapSettings, "AISeed") ||
!Script::GetProperty(rq, m_MapSettings, "AISeed", seed))
LOGWARNING("CSimulation2Impl::InitRNGSeedAI: No seed value specified - using %d", seed);
@@ -405,7 +405,7 @@ void CSimulation2Impl::Update(int turnLength, const std::vector<SimulationComman
const bool serializationTestHash = true; // set true to save and compare hash of state
SerializationTestState primaryStateBefore;
const ScriptInterface& scriptInterface = m_ComponentManager.GetScriptInterface();
const Script::Interface& scriptInterface = m_ComponentManager.GetScriptInterface();
const bool startSerializationTest = m_SerializationTestTurn.has_value() &&
std::cmp_equal(m_SerializationTestTurn.value(), m_TurnNumber);
@@ -446,18 +446,18 @@ void CSimulation2Impl::Update(int turnLength, const std::vector<SimulationComman
std::ref(*m_SecondaryComponentManager), m_SecondaryLoadedScripts.get()));
ResetComponentState(*m_SecondaryComponentManager, false, false);
ScriptRequest rq(scriptInterface);
Script::Request rq(scriptInterface);
// Clone InitAttributes.
{
const ScriptRequest rq2(m_SecondaryComponentManager->GetScriptInterface());
const Script::Request rq2(m_SecondaryComponentManager->GetScriptInterface());
const JS::RootedValue initAttributesCloned(rq2.cx, Script::CloneValueFromOtherCompartment(m_SecondaryComponentManager->GetScriptInterface(), scriptInterface, m_InitAttributes));
m_SecondaryComponentManager->GetScriptInterface().SetGlobal("InitAttributes", initAttributesCloned, true, true, true);
}
// Load the trigger scripts after we have loaded the simulation.
{
ScriptRequest rq2(m_SecondaryComponentManager->GetScriptInterface());
Script::Request rq2(m_SecondaryComponentManager->GetScriptInterface());
JS::RootedValue mapSettingsCloned(rq2.cx, Script::CloneValueFromOtherCompartment(m_SecondaryComponentManager->GetScriptInterface(), scriptInterface, m_MapSettings));
ENSURE(LoadTriggerScripts(*m_SecondaryComponentManager, mapSettingsCloned, m_SecondaryLoadedScripts.get()));
}
@@ -662,7 +662,7 @@ void CSimulation2Impl::DumpState()
////////////////////////////////////////////////////////////////
CSimulation2::CSimulation2(CUnitManager* unitManager, ScriptContext& cx, CTerrain* terrain,
CSimulation2::CSimulation2(CUnitManager* unitManager, Script::Context& cx, CTerrain* terrain,
const std::span<const wchar_t* const> scriptDirectories, const SimulationDebugOptions debugOptions) :
m(std::make_unique<CSimulation2Impl>(unitManager, cx, terrain, scriptDirectories, debugOptions))
{
@@ -727,28 +727,28 @@ const CSimContext& CSimulation2::GetSimContext() const
return m->m_SimContext;
}
ScriptInterface& CSimulation2::GetScriptInterface() const
Script::Interface& CSimulation2::GetScriptInterface() const
{
return m->m_ComponentManager.GetScriptInterface();
}
void CSimulation2::PreInitGame()
{
ScriptRequest rq(GetScriptInterface());
Script::Request rq(GetScriptInterface());
JS::RootedValue global(rq.cx, rq.globalValue());
ScriptFunction::CallVoid(rq, global, "PreInitGame");
Script::Function::CallVoid(rq, global, "PreInitGame");
}
void CSimulation2::InitGame()
{
ScriptRequest rq(GetScriptInterface());
Script::Request rq(GetScriptInterface());
JS::RootedValue global(rq.cx, rq.globalValue());
JS::RootedValue settings(rq.cx);
JS::RootedValue tmpInitAttributes(rq.cx, GetInitAttributes());
Script::GetProperty(rq, tmpInitAttributes, "settings", &settings);
ScriptFunction::CallVoid(rq, global, "InitGame", settings);
Script::Function::CallVoid(rq, global, "InitGame", settings);
}
void CSimulation2::Update(int turnLength)
@@ -807,7 +807,7 @@ void CSimulation2::GetInitAttributes(JS::MutableHandleValue ret)
void CSimulation2::SetMapSettings(const std::string& settings)
{
Script::ParseJSON(ScriptRequest(m->m_ComponentManager.GetScriptInterface()), settings, &m->m_MapSettings);
Script::ParseJSON(Script::Request(m->m_ComponentManager.GetScriptInterface()), settings, &m->m_MapSettings);
}
void CSimulation2::SetMapSettings(JS::HandleValue settings)
@@ -820,7 +820,7 @@ void CSimulation2::SetMapSettings(JS::HandleValue settings)
std::string CSimulation2::GetMapSettingsString()
{
return Script::StringifyJSON(ScriptRequest(m->m_ComponentManager.GetScriptInterface()), &m->m_MapSettings);
return Script::StringifyJSON(Script::Request(m->m_ComponentManager.GetScriptInterface()), &m->m_MapSettings);
}
void CSimulation2::GetMapSettings(JS::MutableHandleValue ret)
@@ -830,19 +830,19 @@ void CSimulation2::GetMapSettings(JS::MutableHandleValue ret)
void CSimulation2::LoadPlayerSettings(bool newPlayers)
{
ScriptRequest rq(GetScriptInterface());
Script::Request rq(GetScriptInterface());
JS::RootedValue global(rq.cx, rq.globalValue());
ScriptFunction::CallVoid(rq, global, "LoadPlayerSettings", m->m_MapSettings, newPlayers);
Script::Function::CallVoid(rq, global, "LoadPlayerSettings", m->m_MapSettings, newPlayers);
}
void CSimulation2::LoadMapSettings()
{
ScriptRequest rq(GetScriptInterface());
Script::Request rq(GetScriptInterface());
JS::RootedValue global(rq.cx, rq.globalValue());
// Initialize here instead of in Update()
ScriptFunction::CallVoid(rq, global, "LoadMapSettings", m->m_MapSettings);
Script::Function::CallVoid(rq, global, "LoadMapSettings", m->m_MapSettings);
Script::DeepFreezeObject(rq, m->m_InitAttributes);
GetScriptInterface().SetGlobal("InitAttributes", m->m_InitAttributes, true, true, true);
@@ -976,8 +976,8 @@ std::string CSimulation2::GetMapSizes()
std::string CSimulation2::GetAIData()
{
const ScriptInterface& scriptInterface = GetScriptInterface();
ScriptRequest rq(scriptInterface);
const Script::Interface& scriptInterface = GetScriptInterface();
Script::Request rq(scriptInterface);
JS::RootedValue aiData(rq.cx, ICmpAIManager::GetAIs(scriptInterface));
// Build single JSON string with array of AI data