From 1906d96064d2cec61cbef517faeb2f1633a60287 Mon Sep 17 00:00:00 2001 From: MiroslavR Date: Tue, 11 Oct 2016 22:15:51 +0200 Subject: [PATCH] Non-player actors emitting light from a non-portable light item should be illuminated (Fixes #3588) --- apps/openmw/mwrender/actoranimation.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp index c16fbfd50..5dcd5212c 100644 --- a/apps/openmw/mwrender/actoranimation.cpp +++ b/apps/openmw/mwrender/actoranimation.cpp @@ -19,6 +19,7 @@ #include "../mwworld/ptr.hpp" #include "../mwworld/class.hpp" #include "../mwworld/cellstore.hpp" +#include "../mwmechanics/actorutil.hpp" #include "vismask.hpp" @@ -104,8 +105,8 @@ void ActorAnimation::addHiddenItemLight(const MWWorld::ConstPtr& item, const ESM mInsert->addChild(lightSource); - if (SceneUtil::LightListCallback* callback = mLightListCallback) - callback->getIgnoredLightSources().insert(lightSource.get()); + if (mLightListCallback && mPtr == MWMechanics::getPlayer()) + mLightListCallback->getIgnoredLightSources().insert(lightSource.get()); mItemLights.insert(std::make_pair(item, lightSource)); } @@ -116,11 +117,11 @@ void ActorAnimation::removeHiddenItemLight(const MWWorld::ConstPtr& item) if (iter == mItemLights.end()) return; - if (SceneUtil::LightListCallback* callback = mLightListCallback) + if (mLightListCallback && mPtr == MWMechanics::getPlayer()) { - std::set::iterator ignoredIter = callback->getIgnoredLightSources().find(iter->second.get()); - if (ignoredIter != callback->getIgnoredLightSources().end()) - callback->getIgnoredLightSources().erase(ignoredIter); + std::set::iterator ignoredIter = mLightListCallback->getIgnoredLightSources().find(iter->second.get()); + if (ignoredIter != mLightListCallback->getIgnoredLightSources().end()) + mLightListCallback->getIgnoredLightSources().erase(ignoredIter); } mInsert->removeChild(iter->second);