From a4fbcb8a1092eb57664f4576e74f11bb92680ec2 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 17 May 2020 22:37:44 +0200
Subject: [PATCH] Remember package iterator to erase it from list without find
 call

---
 apps/openmw/mwmechanics/aisequence.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index d33a0a3f82..00d44202a0 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -212,7 +212,8 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
             return;
         }
 
-        MWMechanics::AiPackage* package = mPackages.front();
+        auto packageIt = mPackages.begin();
+        MWMechanics::AiPackage* package = *packageIt;
         if (!package->alwaysActive() && outOfRange)
             return;
 
@@ -274,7 +275,8 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                 mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
             }
 
-            package = mPackages.front();
+            packageIt = mPackages.begin();
+            package = *packageIt;
             packageTypeId = package->getTypeId();
         }
 
@@ -290,9 +292,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                 }
                 // To account for the rare case where AiPackage::execute() queued another AI package
                 // (e.g. AiPursue executing a dialogue script that uses startCombat)
-                std::list<MWMechanics::AiPackage*>::iterator toRemove =
-                        std::find(mPackages.begin(), mPackages.end(), package);
-                mPackages.erase(toRemove);
+                mPackages.erase(packageIt);
                 delete package;
                 if (isActualAiPackage(packageTypeId))
                     mDone = true;