From 82a09a988bcd0b0cd2202b7bc2bfc346234f2ea8 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 29 Aug 2013 19:17:27 -0700
Subject: [PATCH] Minor pathfinding cleanup

---
 apps/openmw/mwmechanics/pathfinding.cpp | 22 ++++++----------------
 apps/openmw/mwmechanics/pathfinding.hpp | 13 ++++++++-----
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 7e0e1550b..8ef0edab8 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -147,13 +147,13 @@ namespace MWMechanics
         mIsPathConstructed = false;
     }
 
-    void PathFinder::buildPath(ESM::Pathgrid::Point startPoint, ESM::Pathgrid::Point endPoint,
-        const ESM::Pathgrid* pathGrid, float xCell, float yCell, bool allowShortcuts)
+    void PathFinder::buildPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,
+                               const ESM::Pathgrid *pathGrid, float xCell, float yCell, bool allowShortcuts)
     {
         if(allowShortcuts)
         {
-            if(MWBase::Environment::get().getWorld()->castRay(startPoint.mX, startPoint.mY, startPoint.mZ, endPoint.mX, endPoint.mY,
-                endPoint.mZ))
+            if(MWBase::Environment::get().getWorld()->castRay(startPoint.mX, startPoint.mY, startPoint.mZ,
+                                                              endPoint.mX, endPoint.mY, endPoint.mZ))
                 allowShortcuts = false;
         }
 
@@ -184,14 +184,14 @@ namespace MWMechanics
             mIsPathConstructed = false;
     }
 
-    float PathFinder::getZAngleToNext(float x, float y)
+    float PathFinder::getZAngleToNext(float x, float y) const
     {
         // This should never happen (programmers should have an if statement checking mIsPathConstructed that prevents this call
         // if otherwise).
         if(mPath.empty())
             return 0;
 
-        ESM::Pathgrid::Point nextPoint = *mPath.begin();
+        const ESM::Pathgrid::Point &nextPoint = *mPath.begin();
         float directionX = nextPoint.mX - x;
         float directionY = nextPoint.mY - y;
         float directionResult = sqrt(directionX * directionX + directionY * directionY);
@@ -217,15 +217,5 @@ namespace MWMechanics
 
         return false;
     }
-
-    std::list<ESM::Pathgrid::Point> PathFinder::getPath()
-    {
-        return mPath;
-    }
-
-    bool PathFinder::isPathConstructed()
-    {
-        return mIsPathConstructed;
-    }
 }
 
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 1727c650f..35e0fa908 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -12,15 +12,18 @@ namespace MWMechanics
             PathFinder();
 
             void clearPath();
-            void buildPath(ESM::Pathgrid::Point startPoint, ESM::Pathgrid::Point endPoint,
-                const ESM::Pathgrid* pathGrid, float xCell = 0, float yCell = 0, bool allowShortcuts = 1);
+            void buildPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,
+                           const ESM::Pathgrid* pathGrid, float xCell = 0, float yCell = 0,
+                           bool allowShortcuts = true);
 
             bool checkPathCompleted(float x, float y, float z);
             ///< \Returns true if the last point of the path has been reached.
-            float getZAngleToNext(float x, float y);
+            float getZAngleToNext(float x, float y) const;
 
-            std::list<ESM::Pathgrid::Point> getPath();
-            bool isPathConstructed();
+            bool isPathConstructed() const
+            {
+                return mIsPathConstructed;
+            }
 
         private:
             std::list<ESM::Pathgrid::Point> mPath;