AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-26 14:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "NPCs detect crime exclusively"

Browse Source 
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
This commit is contained in:
Jeffrey Haines 2014-04-27 09:34:33 -04:00
parent 13416a3501
commit ce106d3bec
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View File

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