From a2e174a40f7a3a639d4024adedc7df8ae8a1cde2 Mon Sep 17 00:00:00 2001 From: Allofich Date: Sat, 1 Oct 2016 22:15:31 +0900 Subject: [PATCH] Don't let water-only creatures prevent resting --- apps/openmw/mwmechanics/actors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index fc1c77caf..2a313df15 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -1535,7 +1535,7 @@ namespace MWMechanics for(std::vector::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter) { const CreatureStats &stats = iter->getClass().getCreatureStats(*iter); - if (stats.isDead() || *iter == actor) + if (stats.isDead() || *iter == actor || iter->getClass().isPureWaterCreature(*iter)) continue; 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))