limited activation range according to GMST settings

apps/openmw/engine.cpp

@@ -74,22 +74,20 @@ bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
 
     if (focusFrameCounter++ == focusUpdateFrame)
     {
-        std::pair<std::string, float> handle = mEnvironment.mWorld->getMWScene()->getFacedHandle();
+        std::string handle = mEnvironment.mWorld->getFacedHandle();
 
         std::string name;
 
-        if (!handle.first.empty())
+        if (!handle.empty())
         {
-            // TODO compare handle.second with max activation range (from a GMST)
-
-            MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle.first);
+            MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle);
 
             if (!ptr.isEmpty())
                 name = MWWorld::Class::get (ptr).getName (ptr);
         }
 
         if (!name.empty())
-            std::cout << "Object: " << name << ", distance: " << handle.second << std::endl;
+            std::cout << "Object: " << name << std::endl;
 
         focusFrameCounter = 0;
     }

apps/openmw/mwworld/world.cpp

@@ -600,4 +600,15 @@ namespace MWWorld
     {
         mCellChanged = false;
     }
+
+    std::string World::getFacedHandle()
+    {
+        std::pair<std::string, float> result = mScene.getFacedHandle();
+
+        if (result.first.empty() ||
+            result.second>getStore().gameSettings.find ("iMaxActivateDist")->i)
+            return "";
+
+        return result.first;
+    }
 }

apps/openmw/mwworld/world.hpp

@@ -83,8 +83,6 @@ namespace MWWorld
 
             ~World();
 
-            MWRender::MWScene* getMWScene() { return &mScene; }
-
             MWRender::PlayerPos& getPlayerPos();
 
             ESMS::ESMStore& getStore();
@@ -133,6 +131,9 @@ namespace MWWorld
             ///< works only for interior cells currently.
 
             void markCellAsUnchanged();
+
+            std::string getFacedHandle();
+            ///< Return handle of the object the player is looking at
     };
 }