mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 20:40:18 +00:00
Code Issues Releases Wiki Activity

Lua fixes

Browse source
This commit is contained in:
Petr Mikheev 2022-01-15 12:01:30 +00:00 committed by uramer
parent 98d1588477
commit 1b7e923b2c
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; mPlayer = ptr;
LocalScripts* localScripts = ptr.getRefData().getLuaScripts(); LocalScripts* localScripts = ptr.getRefData().getLuaScripts();
if (!localScripts) if (!localScripts)
{
localScripts = createLocalScripts(ptr, ESM::LuaScriptCfg::sPlayer); localScripts = createLocalScripts(ptr, ESM::LuaScriptCfg::sPlayer);
localScripts->addAutoStartedScripts();
}
mActiveLocalScripts.insert(localScripts); mActiveLocalScripts.insert(localScripts);
mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}}); mLocalEngineEvents.push_back({getId(ptr), LocalScripts::OnActive{}});
mPlayerChanged = true; mPlayerChanged = true;
@ -274,7 +277,10 @@ namespace MWLua
{ {
ESM::LuaScriptCfg::Flags flag = getLuaScriptFlag(ptr); ESM::LuaScriptCfg::Flags flag = getLuaScriptFlag(ptr);
if (!mConfiguration.getListByFlag(flag).empty()) 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) if (localScripts)
{ {
@ -327,6 +333,7 @@ namespace MWLua
if (!localScripts) if (!localScripts)
{ {
localScripts = createLocalScripts(ptr, getLuaScriptFlag(ptr)); localScripts = createLocalScripts(ptr, getLuaScriptFlag(ptr));
localScripts->addAutoStartedScripts();
if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell())) if (ptr.isInCell() && MWBase::Environment::get().getWorld()->isCellActive(ptr.getCell()))
mActiveLocalScripts.insert(localScripts); mActiveLocalScripts.insert(localScripts);
} }
@ -354,7 +361,6 @@ namespace MWLua
} }
scripts->addPackage("openmw.nearby", mNearbyPackage); scripts->addPackage("openmw.nearby", mNearbyPackage);
scripts->setSerializer(mLocalSerializer.get()); scripts->setSerializer(mLocalSerializer.get());
scripts->addAutoStartedScripts();
MWWorld::RefData& refData = ptr.getRefData(); MWWorld::RefData& refData = ptr.getRefData();
refData.setLuaScripts(std::move(scripts)); refData.setLuaScripts(std::move(scripts));

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

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