mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lua_fix' into 'master'

Browse Source 
Lua fixes

Closes #6549

See merge request OpenMW/openmw!1557
This commit is contained in:
uramer 2022-01-15 12:01:30 +00:00
commit c33534f468
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwlua/luamanagerimp.cpp
View File

@ -244,7 +244,10 @@ namespace MWLua
mPlayer = ptr;
LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
if (!localScripts)
{
localScripts = createLocalScripts(ptr, ESM::LuaScriptCfg::sPlayer);
localScripts->addAutoStartedScripts();
}
mActiveLocalScripts.insert(localScripts);
mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
mPlayerChanged = true;
@ -274,7 +277,10 @@ namespace MWLua
{
ESM::LuaScriptCfg::Flags flag = getLuaScriptFlag(ptr);
if (!mConfiguration.getListByFlag(flag).empty())
localScripts = createLocalScripts(ptr, flag); // TODO: put to a queue and apply on next `update()`
{
localScripts = createLocalScripts(ptr, flag);
localScripts->addAutoStartedScripts(); // TODO: put to a queue and apply on next `update()`
}
}
if (localScripts)
{
@ -327,6 +333,7 @@ namespace MWLua
if (!localScripts)
{
localScripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
localScripts->addAutoStartedScripts();
if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell()))
mActiveLocalScripts.insert(localScripts);
}
@ -354,7 +361,6 @@ namespace MWLua
}
scripts->addPackage("openmw.nearby", mNearbyPackage);
scripts->setSerializer(mLocalSerializer.get());
scripts->addAutoStartedScripts();
MWWorld::RefData& refData = ptr.getRefData();
refData.setLuaScripts(std::move(scripts));

1
apps/openmw/mwlua/luamanagerimp.hpp
View File

@ -24,6 +24,7 @@ namespace MWLua
{
public:
LuaManager(const VFS::Manager* vfs, const std::string& libsDir);
~LuaManager() { clear(); }
// Called by engine.cpp when the environment is fully initialized.
void init();