From f754e06be955499596be03c2c5817670d805431a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=9Aciubid=C5=82o?=
 <michal.sciubidlo@gmail.com>
Date: Wed, 30 Jul 2014 07:47:09 +0100
Subject: [PATCH] Fix for bug 1685

---
 apps/openmw/mwmechanics/aiwander.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 27dad88cd..3b093d6f6 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -428,10 +428,10 @@ namespace MWMechanics
             
             if (mSaidGreeting == Greet_None)
             {
-                if (playerDistSqr <= helloDistance*helloDistance)
+                if ((playerDistSqr <= helloDistance*helloDistance) && MWBase::Environment::get().getWorld()->getLOS(player, actor)
+                    && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, actor))
                     greetingTimer++;
                 
-                // TODO: check if actor is aware / has line of sight
                 if (greetingTimer >= GREETING_SHOULD_START)
                 {
                     mSaidGreeting = Greet_InProgress;