mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-04 13:41:24 +00:00
Code Issues Releases Wiki Activity

Ignore containers without resolved content for Detect spells

Browse source
This commit is contained in:
Andrei Kortunov 2019-05-04 14:09:52 +04:00
parent 29cfd2c583
commit c91d1e7394
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwworld/worldimp.cpp
View file

@ -3335,9 +3335,13 @@ namespace MWWorld
return true; return true;
// Consider references inside containers as well (except if we are looking for a Creature, they cannot be in containers) // Consider references inside containers as well (except if we are looking for a Creature, they cannot be in containers)
if (mType != World::Detect_Creature && bool isContainer = ptr.getClass().getTypeName() == typeid(ESM::Container).name();
(ptr.getClass().isActor() || ptr.getClass().getTypeName() == typeid(ESM::Container).name())) if (mType != World::Detect_Creature && (ptr.getClass().isActor() || isContainer))
{ {
// but ignore containers without resolved content
if (isContainer && ptr.getRefData().getCustomData() == nullptr)
return true;
MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr); MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
{ {
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it) for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)