Revert "NPCs detect crime exclusively"

This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72. Conflicts: apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
11 years ago · ce106d3bec
parent 13416a3501
commit ce106d3bec
1 changed files with 3 additions and 0 deletions
--- 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) ) ||