AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-11 13:25:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow to handle activation in Lua even for mwscripted objects

Browse Source
This commit is contained in:
Petr Mikheev 2023-07-22 16:57:39 +02:00
parent 62ef209185
commit c5871a5a7a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwlua/luabindings.cpp
View File

@ -274,6 +274,8 @@ namespace MWLua
}); });
api["_runStandardActivationAction"] = [context](const GObject& object, const GObject& actor) { api["_runStandardActivationAction"] = [context](const GObject& object, const GObject& actor) {
if (!object.ptr().getRefData().activate())
return;
context.mLuaManager->addAction( context.mLuaManager->addAction(
[object, actor] { [object, actor] {
const MWWorld::Ptr& objPtr = object.ptr(); const MWWorld::Ptr& objPtr = object.ptr();

3
apps/openmw/mwworld/worldimp.cpp
View File

@ -3707,8 +3707,7 @@ namespace MWWorld
void World::activate(const Ptr& object, const Ptr& actor) void World::activate(const Ptr& object, const Ptr& actor)
{ {
breakInvisibility(actor); breakInvisibility(actor);
if (object.getRefData().activate()) MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
MWBase::Environment::get().getLuaManager()->objectActivated(object, actor);
} }
struct ResetActorsVisitor struct ResetActorsVisitor