Don't report crime if we are in combat with the victim

11 years ago · 2d74388a76
parent 216ebac2e9
commit 2d74388a76
1 changed files with 6 additions and 0 deletions
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@ -973,6 +973,9 @@ namespace MWMechanics
                if (!it->getClass().isNpc())
                    continue;

+                if (it->getClass().getCreatureStats(*it).getAiSequence().isInCombat(victim))
+                    continue;
+
                // Will the witness report the crime?
                if (it->getClass().getCreatureStats(*it).getAiSetting(CreatureStats::AI_Alarm).getBase() >= alarm)
                {
@ -1071,6 +1074,9 @@ namespace MWMechanics
            if (*it != victim && type == OT_Assault)
                aggression = iFightAttacking;

+            if (it->getClass().getCreatureStats(*it).getAiSequence().isInCombat(victim))
+                continue;
+
            if (it->getClass().isClass(*it, "guard"))
            {
                // Mark as Alarmed for dialogue