From 256c9917a415d22d5525beb6ba2f6571a10bf6cd Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 16 May 2020 14:58:50 +0200
Subject: [PATCH] Make AiWander::isPackageCompleted const

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

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index e370394031..f04477243f 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -235,8 +235,9 @@ namespace MWMechanics
         if (mDistance <= 0)
             storage.mCanWanderAlongPathGrid = false;
 
-        if (isPackageCompleted(actor))
+        if (isPackageCompleted())
         {
+            stopWalking(actor);
             // Reset package so it can be used again
             mRemainingDuration=mDuration;
             init();
@@ -320,19 +321,10 @@ namespace MWMechanics
         return actor.getRefData().getPosition().asVec3();
     }
 
-    bool AiWander::isPackageCompleted(const MWWorld::Ptr& actor)
+    bool AiWander::isPackageCompleted() const
     {
-        if (mDuration)
-        {
-            // End package if duration is complete
-            if (mRemainingDuration <= 0)
-            {
-                stopWalking(actor);
-                return true;
-            }
-        }
-        // if get here, not yet completed
-        return false;
+        // End package if duration is complete
+        return mDuration && mRemainingDuration <= 0;
     }
 
     /*
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 716c695ea2..8154ea9954 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -133,7 +133,7 @@ namespace MWMechanics
             void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
             void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
-            bool isPackageCompleted(const MWWorld::Ptr& actor);
+            inline bool isPackageCompleted() const;
             void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
             bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination);
             void completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage);