mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 22:39:44 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1084 from Allofich/water

Browse source 
Don't let water-only creatures prevent resting
This commit is contained in:
scrawl 2016-10-01 16:14:19 +02:00 committed by GitHub
commit b170efb9fa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1535,7 +1535,7 @@ namespace MWMechanics
for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter) for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter)
{ {
const CreatureStats &stats = iter->getClass().getCreatureStats(*iter); const CreatureStats &stats = iter->getClass().getCreatureStats(*iter);
if (stats.isDead() || *iter == actor) if (stats.isDead() || *iter == actor || iter->getClass().isPureWaterCreature(*iter))
continue; continue;
const bool isFollower = std::find(followers.begin(), followers.end(), *iter) != followers.end(); const bool isFollower = std::find(followers.begin(), followers.end(), *iter) != followers.end();
if (stats.getAiSequence().isInCombat(actor) || (MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor) && !isFollower)) if (stats.getAiSequence().isInCombat(actor) || (MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor) && !isFollower))