mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 12:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-6633' into 'master'

Browse Source 
Fix #6633: AiSequence packages being removed incorrectly

Closes #6633

See merge request OpenMW/openmw!1678
This commit is contained in:
psi29a 2022-02-19 13:55:42 +00:00
commit 85c0d93274
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openmw/mwmechanics/aisequence.cpp
View File

@ -315,9 +315,16 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
mPackages.push_back(package->clone()); mPackages.push_back(package->clone());
} }
// To account for the rare case where AiPackage::execute() queued another AI package // The active package is typically the first entry, this is however not always the case
// (e.g. AiPursue executing a dialogue script that uses startCombat) // e.g. AiPursue executing a dialogue script that uses startCombat adds a combat package to the front
erase(mPackages.begin()); // due to the priority.
auto activePackageIt = std::find_if(mPackages.begin(), mPackages.end(), [&](auto& entry)
{
return entry.get() == package;
});
erase(activePackageIt);
if (isActualAiPackage(packageTypeId)) if (isActualAiPackage(packageTypeId))
mDone = true; mDone = true;
} }