mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-02 18:56:39 +00:00
Code Issues Releases Wiki Activity

Clarify the resetInitialPosition loop

Browse source
This commit is contained in:
Evil Eye 2025-03-23 21:44:04 +01:00
parent 88cac9b0fa
commit 73811b45b1
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/openmw/mwmechanics/aisequence.cpp
View file

@ -432,14 +432,8 @@ namespace MWMechanics
} }
// insert new package in correct place depending on priority // insert new package in correct place depending on priority
bool resetInitialPositions = false;
for (auto it = mPackages.begin(); it != mPackages.end(); ++it) for (auto it = mPackages.begin(); it != mPackages.end(); ++it)
{ {
if (resetInitialPositions)
{
(*it)->resetInitialPosition();
continue;
}
// We should override current AiCast package, if we try to add a new one. // We should override current AiCast package, if we try to add a new one.
if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Cast if ((*it)->getTypeId() == MWMechanics::AiPackageTypeId::Cast
&& package.getTypeId() == MWMechanics::AiPackageTypeId::Cast) && package.getTypeId() == MWMechanics::AiPackageTypeId::Cast)
@ -455,13 +449,13 @@ namespace MWMechanics
onPackageAdded(package); onPackageAdded(package);
it = mPackages.insert(it, package.clone()); it = mPackages.insert(it, package.clone());
if (newTypeId == MWMechanics::AiPackageTypeId::Follow) if (newTypeId == MWMechanics::AiPackageTypeId::Follow)
resetInitialPositions = true; {
else for (++it; it != mPackages.end(); ++it)
return; (*it)->resetInitialPosition();
}
return;
} }
} }
if (resetInitialPositions)
return;
onPackageAdded(package); onPackageAdded(package);
mPackages.push_back(package.clone()); mPackages.push_back(package.clone());