From ff67a9e2333fbbee8144dcba1c70d2f3d3743098 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Wed, 20 Mar 2019 01:08:06 +0300
Subject: [PATCH] Build straight path for wandering flying and water creatures

---
 apps/openmw/mwmechanics/aiwander.cpp    | 15 +++++++++++----
 apps/openmw/mwmechanics/pathfinding.cpp |  7 +++++++
 apps/openmw/mwmechanics/pathfinding.hpp |  2 ++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 8ed9cf8d20..e334f72daf 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -318,10 +318,17 @@ namespace MWMechanics
             if ((isWaterCreature || isFlyingCreature) && destinationThroughGround(currentPosition, mDestination))
                 continue;
 
-            const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
-            mPathFinder.buildPath(actor, currentPosition, mDestination, actor.getCell(),
-                getPathGridGraph(actor.getCell()), halfExtents, getNavigatorFlags(actor));
-            mPathFinder.addPointToPath(mDestination);
+            if (isWaterCreature || isFlyingCreature)
+            {
+                mPathFinder.buildStraightPath(mDestination);
+            }
+            else
+            {
+                const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+                mPathFinder.buildPath(actor, currentPosition, mDestination, actor.getCell(),
+                    getPathGridGraph(actor.getCell()), halfExtents, getNavigatorFlags(actor));
+                mPathFinder.addPointToPath(mDestination);
+            }
 
             if (mPathFinder.isPathConstructed())
             {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index e0285be928..13c2180081 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -269,6 +269,13 @@ namespace MWMechanics
             mPath.pop_front();
     }
 
+    void PathFinder::buildStraightPath(const osg::Vec3f& endPoint)
+    {
+        mPath.clear();
+        mPath.push_back(endPoint);
+        mConstructed = true;
+    }
+
     void PathFinder::buildPathByPathgrid(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
         const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph)
     {
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 8a5b8338ab..b59af44fd8 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -72,6 +72,8 @@ namespace MWMechanics
                 mCell = nullptr;
             }
 
+            void buildStraightPath(const osg::Vec3f& endPoint);
+
             void buildPathByPathgrid(const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
                 const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph);