mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-29 03:26:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'clean_lua_ui' into 'master'

Browse source 
Clear Lua-created UI on game load and reloadlua command

See merge request OpenMW/openmw!1418
This commit is contained in:
Petr Mikheev 2021-11-22 19:17:36 +00:00
commit a39305b108
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,7 @@ namespace MWLua
// Implemented in uibindings.cpp // Implemented in uibindings.cpp
sol::table initUserInterfacePackage(const Context&); sol::table initUserInterfacePackage(const Context&);
void clearUserInterface();
// Implemented in inputbindings.cpp // Implemented in inputbindings.cpp
sol::table initInputPackage(const Context&); sol::table initInputPackage(const Context&);

2
apps/openmw/mwlua/luamanagerimp.cpp
View file

@ -220,6 +220,7 @@ namespace MWLua
mPlayer.getRefData().setLuaScripts(nullptr); mPlayer.getRefData().setLuaScripts(nullptr);
mPlayer = MWWorld::Ptr(); mPlayer = MWWorld::Ptr();
} }
clearUserInterface();
} }
void LuaManager::setupPlayer(const MWWorld::Ptr& ptr) void LuaManager::setupPlayer(const MWWorld::Ptr& ptr)
@ -425,6 +426,7 @@ namespace MWLua
continue; continue;
ESM::LuaScripts data; ESM::LuaScripts data;
scripts->save(data); scripts->save(data);
clearUserInterface();
scripts->load(data); scripts->load(data);
} }
for (LocalScripts* scripts : mActiveLocalScripts) for (LocalScripts* scripts : mActiveLocalScripts)

9
apps/openmw/mwlua/uibindings.cpp
View file

@ -10,6 +10,7 @@ namespace MWLua
{ {
namespace namespace
{ {
std::set<LuaUi::Element*> allElements;
class UiAction final : public Action class UiAction final : public Action
{ {
@ -152,6 +153,7 @@ namespace MWLua
{ {
if (element->mDestroy) if (element->mDestroy)
return; return;
allElements.erase(element.get());
element->mDestroy = true; element->mDestroy = true;
context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::DESTROY, element, context.mLua)); context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::DESTROY, element, context.mLua));
}; };
@ -168,6 +170,7 @@ namespace MWLua
api["create"] = [context](const sol::table& layout) api["create"] = [context](const sol::table& layout)
{ {
auto element = std::make_shared<LuaUi::Element>(layout); auto element = std::make_shared<LuaUi::Element>(layout);
allElements.emplace(element.get());
context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua)); context.mLuaManager->addAction(std::make_unique<UiAction>(UiAction::CREATE, element, context.mLua));
return element; return element;
}; };
@ -180,4 +183,10 @@ namespace MWLua
return LuaUtil::makeReadOnly(api); return LuaUtil::makeReadOnly(api);
} }
void clearUserInterface()
{
for (auto element : allElements)
element->destroy();
allElements.clear();
}
} }