teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Do not count dead NPCs as observers (Fixes #3434)

Browse source
This commit is contained in:
scrawl 2016-06-07 22:01:44 +02:00
parent 12eea9ed69
commit 165f048792
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwmechanics/actors.cpp
View file

@ -1144,14 +1144,19 @@ namespace MWMechanics
for (PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter) for (PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
{ {
MWWorld::Ptr observer = iter->first;
if (iter->first == player) // not the player if (iter->first == player) // not the player
continue; continue;
if (observer.getClass().getCreatureStats(observer).isDead())
continue;
// is the player in range and can they be detected // is the player in range and can they be detected
if ((iter->first.getRefData().getPosition().asVec3() - player.getRefData().getPosition().asVec3()).length2() <= radius*radius if ((observer.getRefData().getPosition().asVec3() - player.getRefData().getPosition().asVec3()).length2() <= radius*radius
&& MWBase::Environment::get().getWorld()->getLOS(player, iter->first)) && MWBase::Environment::get().getWorld()->getLOS(player, observer))
{ {
if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, iter->first)) if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, observer))
{ {
detected = true; detected = true;
avoidedNotice = false; avoidedNotice = false;