From d956df83e48d2b7ff472bb6a4341328cbb456f82 Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 28 Jul 2014 17:19:20 +0200 Subject: [PATCH] Don't make guards fight non-aggressive creatures that are in combat Ex. summoned creature that is helping in a fight. --- apps/openmw/mwmechanics/actors.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 67e80ec67..bd87f8b4b 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -220,9 +220,8 @@ namespace MWMechanics // Make guards fight aggressive creatures if (!actor1.getClass().isNpc() && actor2.getClass().isClass(actor2, "Guard")) { - // if creature is hostile then it is necessarily to start combat - if (creatureStats.getAiSequence().isInCombat()) aggressive = true; - else aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2); + if (creatureStats.getAiSequence().isInCombat() && MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2)) + aggressive = true; } }