From c3e08916dadd70ac926cb6f3d92ee8c4b4efa50f Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Thu, 24 Apr 2014 20:40:17 -0400
Subject: [PATCH] Sneak: Added support for state checking

I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
---
 apps/openmw/mwbase/mechanicsmanager.hpp         |  3 +++
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp |  5 +++++
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp |  2 ++
 apps/openmw/mwworld/player.cpp                  | 15 +++++++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 22dda0ce0..7d27e73bd 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -164,6 +164,9 @@ namespace MWBase
             ///return the list of actors which are following the given actor (ie AiFollow is active and the target is the actor)
             virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor) = 0;
 
+            ///return the list of actors
+            virtual MWMechanics::Actors& getActors() = 0;
+
             virtual void playerLoaded() = 0;
     };
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 84dc337c9..868a09e2e 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -989,4 +989,9 @@ namespace MWMechanics
     {
         return mActors.getActorsFollowing(actor);
     }
+
+    MWMechanics::Actors& MechanicsManager::getActors()
+    {
+        return *mActors;
+    }
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 761caf586..a00c79525 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -137,6 +137,8 @@ namespace MWMechanics
 
             virtual std::list<MWWorld::Ptr> getActorsFollowing(const MWWorld::Ptr& actor);
 
+            virtual MWMechanics::Actors& getActors();
+
             virtual void toggleAI();
             virtual bool isAIActive();
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index a4a4e9568..9cc873c0f 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -9,6 +9,8 @@
 #include <components/esm/defs.hpp>
 #include <components/esm/loadbsgn.hpp>
 
+#include "../mwworld/esmstore.hpp"
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -16,6 +18,8 @@
 
 #include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/actors.hpp"
+#include "../mwmechanics/mechanicsmanagerimp.hpp"
 
 #include "class.hpp"
 #include "ptr.hpp"
@@ -130,8 +134,15 @@ namespace MWWorld
 
         ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak);
 
-        // TODO show sneak indicator only when the player is not detected by any actor
-        MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
+        // Find all the actors who might be able to see the player
+        std::vector<MWWorld::Ptr> neighbors;
+        MWBase::Environment::get().getMechanicsManager()->getActors().getObjectsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
+                                    esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
+        for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
+            if ( MechanicsManager::awarenessCheck(ptr, *it) ) 
+                MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
+        if (!neighbors)
+            MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
     }
 
     void Player::yaw(float yaw)