mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-28 23:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Script::CreateArray

Browse Source 
It's better to construct a js-array from a `JS::RootedValueVector`.
Because it is more strongly typed and the index doesn't has to be
specified when appending an element.
Some usages are replaced with `JS::RootedValueArray`.

Fixes: #8702
This commit is contained in:
phosit
2026-02-02 18:24:57 +01:00
parent fe9c0f6c2f
commit df18e22277
14 changed files with 146 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/scripting/JSInterface_ModIo.cpp
+7 -6
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -70,10 +70,10 @@ JS::Value GetMods(const ScriptRequest& rq)
const std::vector<ModIoModData>& availableMods = g_ModIo->GetMods();
JS::RootedValue mods(rq.cx);
Script::CreateArray(rq, &mods, availableMods.size());
JS::RootedValueVector mods{rq.cx};
if (!mods.reserve(availableMods.size()))
throw std::runtime_error{"Reserve failed"};
u32 i = 0;
for (const ModIoModData& mod : availableMods)
{
JS::RootedValue m(rq.cx);
@@ -83,10 +83,11 @@ JS::Value GetMods(const ScriptRequest& rq)
Script::SetProperty(rq, m, prop.first.c_str(), prop.second, true);
Script::SetProperty(rq, m, "dependencies", mod.dependencies, true);
Script::SetPropertyInt(rq, mods, i++, m);
if (!mods.append(m))
throw std::runtime_error{"Append failed"};
}
return mods;
return JS::ObjectValue(*JS::NewArrayObject(rq.cx, mods));
}
const std::map<DownloadProgressStatus, std::string> statusStrings = {