Extracted function SetCurrentNodeToClosestAllowedNode()

apps/openmw/mwmechanics/aiwander.cpp

@@ -1,5 +1,7 @@
 #include "aiwander.hpp"
 
+#include <cfloat>
+
 #include <components/misc/rng.hpp>
 
 #include <components/esm/aisequence.hpp>
@@ -700,22 +702,29 @@ namespace MWMechanics
             }
             if(!mAllowedNodes.empty())
             {
-                osg::Vec3f firstNodePos(PathFinder::MakeOsgVec3(mAllowedNodes[0]));
+                SetCurrentNodeToClosestAllowedNode(npcPos);
-                float closestNode = (npcPos - firstNodePos).length2();
+            }
+            mStoredAvailableNodes = true; // set only if successful in finding allowed nodes
+        }
+    }
+
+    void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos)
+    {
+        float distanceToClosestNode = FLT_MAX;
         unsigned int index = 0;
-                for(unsigned int counterThree = 1; counterThree < mAllowedNodes.size(); counterThree++)
+        for (unsigned int counterThree = 0; counterThree < mAllowedNodes.size(); counterThree++)
         {
             osg::Vec3f nodePos(PathFinder::MakeOsgVec3(mAllowedNodes[counterThree]));
             float tempDist = (npcPos - nodePos).length2();
-                    if(tempDist < closestNode)
+            if (tempDist < distanceToClosestNode)
+            {
                 index = counterThree;
+                distanceToClosestNode = tempDist;
+            }
         }
         mCurrentNode = mAllowedNodes[index];
         mAllowedNodes.erase(mAllowedNodes.begin() + index);
     }
-            mStoredAvailableNodes = true; // set only if successful in finding allowed nodes
-        }
-    }
 
     void AiWander::writeState(ESM::AiSequence::AiSequence &sequence) const
     {

apps/openmw/mwmechanics/aiwander.hpp

@@ -121,6 +121,8 @@ namespace MWMechanics
             /// convert point from local (i.e. cell) to world co-ordinates
             void ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell);
 
+            void SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos);
+
             /// lookup table for converting idleSelect value to groupName
             static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
     };