From cc78be5982e1331300d07c081d89b5a38821fee3 Mon Sep 17 00:00:00 2001
From: Dave Corley <73663882+magicaldave@users.noreply.github.com>
Date: Sun, 8 Oct 2023 13:32:16 -0500
Subject: [PATCH] Fix(Client): Correctly play combat music (#29)

* Fix(Client): Correctly play combat music

* Cleanup(actors.cpp): Reformat conditionals
---
 apps/openmw/mwmechanics/actors.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 0bf28e47d..d260b8284 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1860,24 +1860,19 @@ namespace MWMechanics
         MWWorld::Ptr player = getPlayer();
         const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
         bool hasHostiles = false; // need to know this to play Battle music
-        bool aiActive = MWBase::Environment::get().getMechanicsManager()->isAIActive();
 
-        if (aiActive)
+        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
         {
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
-            {
-                if (iter->first == player) continue;
+            if (iter->first == player) continue;
 
-                bool inProcessingRange = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange;
-                if (inProcessingRange)
-                {
-                    MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
-                    if (!stats.isDead() && stats.getAiSequence().isInCombat())
-                    {
-                        hasHostiles = true;
-                        break;
-                    }
-                }
+            bool inProcessingRange = (playerPos - iter->first.getRefData().getPosition().asVec3()).length2() <= mActorsProcessingRange*mActorsProcessingRange;
+            if (!inProcessingRange) continue;
+
+            MWMechanics::CreatureStats& stats = iter->first.getClass().getCreatureStats(iter->first);
+            if (!stats.isDead() && stats.getAiSequence().isInCombat())
+            {
+                hasHostiles = true;
+                break;
             }
         }