From 46d93f1b08984c234a090a4207f40e8480c4147a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Dec 2014 16:36:01 +0100
Subject: [PATCH] Crime update: NPCs can report crimes if they didn't see the
 crime, but were alerted by someone who saw it and did not report it
 themselves.

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b24232747..b4edf44aa 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -930,7 +930,6 @@ namespace MWMechanics
 
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-        bool reported = false;
 
         // Find all the actors within the alarm radius
         std::vector<MWWorld::Ptr> neighbors;
@@ -947,6 +946,8 @@ namespace MWMechanics
         bool victimAware = false;
 
         // Find actors who directly witnessed the crime
+        bool crimeSeen = false;
+        bool reported = false;
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
             if (*it == player)
@@ -974,15 +975,17 @@ namespace MWMechanics
                 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() >= 100)
-                {
-                    reported = true;
-                }
+                crimeSeen = true;
+            }
+
+            // Will the witness report the crime?
+            if (it->getClass().getCreatureStats(*it).getAiSetting(CreatureStats::AI_Alarm).getBase() >= 100)
+            {
+                reported = true;
             }
         }
 
-        if (reported)
+        if (crimeSeen && reported)
             reportCrime(player, victim, type, arg);
         else if (victimAware && !victim.isEmpty() && type == OT_Assault)
             startCombat(victim, player);