mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 17:41:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_use_item' into 'master'

Browse source 
Fix #7674

Closes #7674

See merge request OpenMW/openmw!3567
This commit is contained in:
Zackhasacat 2023-11-07 03:07:43 +00:00
commit 5a0de322a3
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,6 +344,12 @@ namespace MWLua
playerScripts->uiModeChanged(argId, false); playerScripts->uiModeChanged(argId, false);
} }
void LuaManager::useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force)
{
MWBase::Environment::get().getWorldModel()->registerPtr(object);
mEngineEvents.addToQueue(EngineEvents::OnUseItem{ getId(actor), getId(object), force });
}
void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr) void LuaManager::objectAddedToScene(const MWWorld::Ptr& ptr)
{ {
mObjectLists.objectAddedToScene(ptr); // assigns generated RefNum if it is not set yet. mObjectLists.objectAddedToScene(ptr); // assigns generated RefNum if it is not set yet.

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

@ -77,10 +77,7 @@ namespace MWLua
{ {
mEngineEvents.addToQueue(EngineEvents::OnActivate{ getId(actor), getId(object) }); mEngineEvents.addToQueue(EngineEvents::OnActivate{ getId(actor), getId(object) });
} }
void useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force) override void useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force) override;
{
mEngineEvents.addToQueue(EngineEvents::OnUseItem{ getId(actor), getId(object), force });
}
void exteriorCreated(MWWorld::CellStore& cell) override void exteriorCreated(MWWorld::CellStore& cell) override
{ {
mEngineEvents.addToQueue(EngineEvents::OnNewExterior{ cell }); mEngineEvents.addToQueue(EngineEvents::OnNewExterior{ cell });