Merge remote-tracking branch 'jeffreyhaines/master'

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -856,7 +856,8 @@ namespace MWMechanics
         // Find an actor who witnessed the crime
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
-            if (*it == ptr) continue; // not the player
+            if (   *it == ptr 
+                || !it->getClass().isNpc()) continue; // not the player and is an NPC
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
@@ -872,7 +873,8 @@ namespace MWMechanics
                     // Tell everyone, including yourself
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
-                        if (*it1 == ptr) continue; // not the player
+                        if (   *it == ptr 
+                            || !it->getClass().isNpc()) continue; // not the player and is an NPC
 
                         // TODO: Add more messages
                         if (type == OT_Theft)