From 9fdfb2a83f488fec895461d1f24b153533effe69 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 11 Jun 2017 10:13:00 +0400 Subject: [PATCH] Spell priority: make AI do not cast target spells when enemy is under water --- apps/openmw/mwmechanics/aicombataction.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp index 358e04d6b..f9b793f94 100644 --- a/apps/openmw/mwmechanics/aicombataction.cpp +++ b/apps/openmw/mwmechanics/aicombataction.cpp @@ -549,7 +549,13 @@ namespace MWMechanics if (effect.mRange == ESM::RT_Target) { if (MWBase::Environment::get().getWorld()->isUnderwater(MWWorld::ConstPtr(actor), 0.75f)) - return 0; + return 0.f; + + if (enemy.isEmpty()) + return 0.f; + + if (MWBase::Environment::get().getWorld()->isUnderwater(MWWorld::ConstPtr(enemy), 0.75f)) + return 0.f; } rating *= magicEffect->mData.mBaseCost;