From ce106d3becb8b1b7739f21011578d86a76f61c7b Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 09:34:33 -0400
Subject: [PATCH] Revert "NPCs detect crime exclusively"

This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 2b1fdd365..26c629fb8 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -843,7 +843,10 @@ namespace MWMechanics
         // Find an actor who witnessed the crime
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
+<<<<<<< HEAD
+=======
             if (*it == ptr) continue; // not the player
+>>>>>>> parent of 54d9615... NPCs detect crime exclusively
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||