mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 08:23:52 +00:00
Code Issues Releases Wiki Activity

broken

Browse source
This commit is contained in:
Jeffrey Haines 2014-04-27 09:34:59 -04:00
parent ce106d3bec
commit b9bd4bc126
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -844,6 +844,8 @@ namespace MWMechanics
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 <<<<<<< 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 >>>>>>> parent of 54d9615... NPCs detect crime exclusively
@ -862,7 +864,8 @@ 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 (*it1 == ptr) continue; // not the player if ( *it == ptr
&& 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)