From 131f2557b16da7c6b7bc4dfa0f181004731ce958 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 May 2020 14:57:20 +0200
Subject: [PATCH] Split functions to remove redundant clearPath argument

---
 apps/openmw/mwmechanics/aiwander.cpp | 18 ++++++++++--------
 apps/openmw/mwmechanics/aiwander.hpp |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 8b90eb1d7e..e370394031 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -89,6 +89,11 @@ namespace MWMechanics
             const auto maxHalfExtent = std::max(halfExtents.x(), std::max(halfExtents.y(), halfExtents.z()));
             return world->isAreaOccupiedByOtherActor(destination, 2 * maxHalfExtent, actor);
         }
+
+        void stopMovement(const MWWorld::Ptr& actor)
+        {
+            actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+        }
     }
 
     AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
@@ -206,7 +211,7 @@ namespace MWMechanics
         {
             if (storage.mState == AiWanderStorage::Wander_Walking)
             {
-                stopWalking(actor, false);
+                stopMovement(actor);
                 mObstacleCheck.clear();
                 storage.setState(AiWanderStorage::Wander_IdleNow);
             }
@@ -609,14 +614,11 @@ namespace MWMechanics
         return TypeIdWander;
     }
 
-    void AiWander::stopWalking(const MWWorld::Ptr& actor, bool clearPath)
+    void AiWander::stopWalking(const MWWorld::Ptr& actor)
     {
-        if (clearPath)
-        {
-            mPathFinder.clearPath();
-            mHasDestination = false;
-        }
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+        mPathFinder.clearPath();
+        mHasDestination = false;
+        stopMovement(actor);
     }
 
     bool AiWander::playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect)
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 405799c1fc..716c695ea2 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -118,7 +118,7 @@ namespace MWMechanics
         private:
             // NOTE: mDistance and mDuration must be set already
             void init();
-            void stopWalking(const MWWorld::Ptr& actor, bool clearPath = true);
+            void stopWalking(const MWWorld::Ptr& actor);
 
             /// Have the given actor play an idle animation
             /// @return Success or error