mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-02 04:15:34 +00:00
Code Issues Releases Wiki Activity

revert

Browse source
This commit is contained in:
Jeffrey Haines 2014-04-27 09:35:49 -04:00
parent b9bd4bc126
commit 0409e18a0e
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -843,12 +843,7 @@ 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
&& it->getClass().isNpc()) continue; // not the player and is an NPC
=======
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) ) ||
@ -864,8 +859,7 @@ namespace MWMechanics
// Tell everyone, including yourself // Tell everyone, including yourself
for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1) for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
{ {
if ( *it == ptr if (*it1 == ptr) continue; // not the player
&& it->getClass().isNpc()) continue; // not the player and is an NPC
// TODO: Add more messages // TODO: Add more messages
if (type == OT_Theft) if (type == OT_Theft)