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

Merge branch 'read_me' into 'master'

Browse source 
Allow activation of inventory items

Closes #5991

See merge request OpenMW/openmw!788
This commit is contained in:
psi29a 2021-05-04 22:53:45 +00:00
commit 9eb876cc17
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -118,6 +118,7 @@
Bug #5923: Clicking on empty spaces between journal entries might show random topics
Bug #5934: AddItem command doesn't accept negative values
Bug #5975: NIF controllers from sheath meshes are used
Bug #5991: Activate should always be allowed for inventory items
Bug #5995: NiUVController doesn't calculate the UV offset properly
Feature #390: 3rd person look "over the shoulder"
Feature #832: OpenMW-CS: Handle deleted references

2
apps/openmw/mwscript/miscextensions.cpp
View file

@ -278,7 +278,7 @@ namespace MWScript
MWWorld::Ptr ptr = R()(runtime);
if (ptr.getRefData().activateByScript())
if (ptr.getRefData().activateByScript() || ptr.getContainerStore())
context.executeActivation(ptr, MWMechanics::getPlayer());
}
};