Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Allow passing initData to the :addSript call (#7091)

Browse source
This commit is contained in:
Petr Mikheev 2022-12-31 22:08:17 +01:00
parent 500e8bdf4c
commit b248c3e173
6 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/lua/scriptscontainer.cpp
View file

@ -35,14 +35,13 @@ namespace LuaUtil
mAPI.emplace(std::move(packageName), makeReadOnly(std::move(package)));
}
bool ScriptsContainer::addCustomScript(int scriptId)
bool ScriptsContainer::addCustomScript(int scriptId, std::string_view initData)
{
const ScriptsConfiguration& conf = mLua.getConfiguration();
assert(conf.isCustomScript(scriptId));
assert(mLua.getConfiguration().isCustomScript(scriptId));
std::optional<sol::function> onInit, onLoad;
bool ok = addScript(scriptId, onInit, onLoad);
if (ok && onInit)
callOnInit(scriptId, *onInit, conf[scriptId].mInitializationData);
callOnInit(scriptId, *onInit, initData);
return ok;
}