paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix debug mode after d5807cd59f

Browse Source 
Reviewed by: temple
Differential Revision: https://code.wildfiregames.com/D1315
This was SVN commit r21336.
This commit is contained in:
Imarok 2018-02-23 20:17:47 +00:00
parent c0349931c0
commit c894eeb856
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/ps/Mod.cpp
View File

@ -131,9 +131,10 @@ JS::Value Mod::GetEngineInfo(const ScriptInterface& scriptInterface)
JSAutoRequest rq(cx);
JS::RootedValue metainfo(cx);
JS::RootedValue mods(cx, Mod::GetLoadedModsWithVersions(scriptInterface));
scriptInterface.Eval("({})", &metainfo);
scriptInterface.SetProperty(metainfo, "engine_version", std::string(engine_version));
scriptInterface.SetProperty(metainfo, "mods", JS::RootedValue(cx, Mod::GetLoadedModsWithVersions(scriptInterface)));
scriptInterface.SetProperty(metainfo, "mods", mods);
scriptInterface.FreezeObject(metainfo, true);

3
source/ps/Replay.cpp
View File

@ -62,7 +62,8 @@ void CReplayLogger::StartGame(JS::MutableHandleValue attribs)
// Add engine version and currently loaded mods for sanity checks when replaying
m_ScriptInterface.SetProperty(attribs, "engine_version", CStr(engine_version));
m_ScriptInterface.SetProperty(attribs, "mods", JS::RootedValue(cx, Mod::GetLoadedModsWithVersions(m_ScriptInterface)));
JS::RootedValue mods(cx, Mod::GetLoadedModsWithVersions(m_ScriptInterface));
m_ScriptInterface.SetProperty(attribs, "mods", mods);
m_Directory = createDateIndexSubdirectory(VisualReplay::GetDirectoryName());
debug_printf("Writing replay to %s\n", m_Directory.string8().c_str());

3
source/ps/SavedGame.cpp
View File

@ -80,9 +80,10 @@ Status SavedGames::Save(const CStrW& name, const CStrW& description, CSimulation
JS::RootedValue metadata(cx);
JS::RootedValue initAttributes(cx, simulation.GetInitAttributes());
JS::RootedValue mods(cx, Mod::GetLoadedModsWithVersions(simulation.GetScriptInterface()));
simulation.GetScriptInterface().Eval("({})", &metadata);
simulation.GetScriptInterface().SetProperty(metadata, "engine_version", std::string(engine_version));
simulation.GetScriptInterface().SetProperty(metadata, "mods", JS::RootedValue(cx, Mod::GetLoadedModsWithVersions(simulation.GetScriptInterface())));
simulation.GetScriptInterface().SetProperty(metadata, "mods", mods);
simulation.GetScriptInterface().SetProperty(metadata, "time", (double)now);
simulation.GetScriptInterface().SetProperty(metadata, "playerID", g_Game->GetPlayerID());
simulation.GetScriptInterface().SetProperty(metadata, "initAttributes", initAttributes);