mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
Move Script* classes to Script namespace
- 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:
+13
-13
@@ -44,8 +44,8 @@
|
||||
#include "ps/Pyrogenesis.h"
|
||||
#include "scriptinterface/JSON.h"
|
||||
#include "scriptinterface/Object.h"
|
||||
#include "scriptinterface/ScriptConversions.h"
|
||||
#include "scriptinterface/ScriptRequest.h"
|
||||
#include "scriptinterface/Conversions.h"
|
||||
#include "scriptinterface/Request.h"
|
||||
#include "scriptinterface/StructuredClone.h"
|
||||
#include "simulation2/Simulation2.h"
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
#include <system_error>
|
||||
#include <utility>
|
||||
|
||||
class ScriptInterface;
|
||||
namespace Script { class Interface; }
|
||||
|
||||
// TODO: we ought to check version numbers when loading files
|
||||
|
||||
@@ -80,7 +80,7 @@ Status SavedGames::SavePrefix(const CStrW& prefix, const CStrW& description, CSi
|
||||
|
||||
Status SavedGames::Save(const CStrW& name, const CStrW& description, CSimulation2& simulation, const Script::StructuredClone& guiMetadataClone)
|
||||
{
|
||||
ScriptRequest rq(simulation.GetScriptInterface());
|
||||
Script::Request rq(simulation.GetScriptInterface());
|
||||
|
||||
// Determine the filename to save under
|
||||
const VfsPath basenameFormat(L"saves/" + name);
|
||||
@@ -180,7 +180,7 @@ class CGameLoader
|
||||
public:
|
||||
|
||||
/**
|
||||
* @param scriptInterface the ScriptInterface used for loading metadata.
|
||||
* @param scriptInterface the Script::Interface used for loading metadata.
|
||||
* @param[out] savedState serialized simulation state stored as string of bytes,
|
||||
* loaded from simulation.dat inside the archive.
|
||||
*
|
||||
@@ -189,11 +189,11 @@ public:
|
||||
* for the metadata because it would be error prone with rooting and the stack-based rooting
|
||||
* types and confusing (a chain of pointers pointing to other pointers).
|
||||
*/
|
||||
CGameLoader(const ScriptInterface& scriptInterface, std::string* savedState) :
|
||||
CGameLoader(const Script::Interface& scriptInterface, std::string* savedState) :
|
||||
m_ScriptInterface(scriptInterface),
|
||||
m_SavedState(savedState)
|
||||
{
|
||||
ScriptRequest rq(scriptInterface);
|
||||
Script::Request rq(scriptInterface);
|
||||
m_Metadata.init(rq.cx);
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ public:
|
||||
std::string buffer;
|
||||
buffer.resize(fileInfo.Size());
|
||||
WARN_IF_ERR(archiveFile->Load("", DummySharedPtr((u8*)buffer.data()), buffer.size()));
|
||||
Script::ParseJSON(ScriptRequest(m_ScriptInterface), buffer, &m_Metadata);
|
||||
Script::ParseJSON(Script::Request(m_ScriptInterface), buffer, &m_Metadata);
|
||||
}
|
||||
else if (pathname == L"simulation.dat" && m_SavedState)
|
||||
{
|
||||
@@ -225,12 +225,12 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
const ScriptInterface& m_ScriptInterface;
|
||||
const Script::Interface& m_ScriptInterface;
|
||||
JS::PersistentRooted<JS::Value> m_Metadata;
|
||||
std::string* m_SavedState;
|
||||
};
|
||||
|
||||
std::optional<SavedGames::LoadResult> SavedGames::Load(const ScriptInterface& scriptInterface,
|
||||
std::optional<SavedGames::LoadResult> SavedGames::Load(const Script::Interface& scriptInterface,
|
||||
const std::wstring& name)
|
||||
{
|
||||
// Determine the filename to load
|
||||
@@ -269,17 +269,17 @@ std::optional<SavedGames::LoadResult> SavedGames::Load(const ScriptInterface& sc
|
||||
return std::nullopt;
|
||||
}
|
||||
}
|
||||
const ScriptRequest rq{scriptInterface};
|
||||
const Script::Request rq{scriptInterface};
|
||||
JS::RootedValue metadata{rq.cx, loader.GetMetadata()};
|
||||
|
||||
// `std::make_optional` can't be used since `LoadResult` doesn't have a constructor.
|
||||
return {{metadata, std::move(savedState)}};
|
||||
}
|
||||
|
||||
JS::Value SavedGames::GetSavedGames(const ScriptInterface& scriptInterface)
|
||||
JS::Value SavedGames::GetSavedGames(const Script::Interface& scriptInterface)
|
||||
{
|
||||
PROFILE2("GetSavedGames");
|
||||
ScriptRequest rq(scriptInterface);
|
||||
Script::Request rq(scriptInterface);
|
||||
|
||||
JS::RootedValueVector games{rq.cx};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user