mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 17:09:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_remove_after_disable' into 'master'

Browse source 
Fix #7441: `obj.enabled = false ; obj:remove()` in Lua doesn't remove the object from scene.

Closes #7441

See merge request OpenMW/openmw!3185
This commit is contained in:
psi29a 2023-06-29 13:32:17 +00:00
commit 51dbc867f9
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,6 +291,8 @@ namespace MWLua
if (enable && object.ptr().getRefData().isDeleted()) if (enable && object.ptr().getRefData().isDeleted())
throw std::runtime_error("Object is removed"); throw std::runtime_error("Object is removed");
context.mLuaManager->addAction([object, enable] { context.mLuaManager->addAction([object, enable] {
if (object.ptr().getRefData().isDeleted())
return;
if (object.ptr().isInCell()) if (object.ptr().isInCell())
{ {
if (enable) if (enable)