mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 21:45:34 +00:00
Code Issues Releases Wiki Activity

fix bugs in aisequence::execute

Browse source
This commit is contained in:
mrcheko 2014-05-24 23:05:30 +04:00
parent 638df221a6
commit 56881cb7c9
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor,float duration)
float nearestDist = std::numeric_limits<float>::max(); float nearestDist = std::numeric_limits<float>::max();
Ogre::Vector3 vActorPos = Ogre::Vector3(actor.getRefData().getPosition().pos); Ogre::Vector3 vActorPos = Ogre::Vector3(actor.getRefData().getPosition().pos);
for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end(); ++it) for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
{ {
if ((*it)->getTypeId() != AiPackage::TypeIdCombat) break; if ((*it)->getTypeId() != AiPackage::TypeIdCombat) break;
@ -147,7 +147,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor,float duration)
if (target.isEmpty()) if (target.isEmpty())
{ {
delete *it; delete *it;
mPackages.erase(it++); it = mPackages.erase(it);
} }
else else
{ {
@ -159,20 +159,26 @@ void AiSequence::execute (const MWWorld::Ptr& actor,float duration)
nearestDist = distTo; nearestDist = distTo;
itActualCombat = it; itActualCombat = it;
} }
++it;
} }
} }
// all targets disappeared if (!mPackages.empty())
if (nearestDist == std::numeric_limits<float>::max()) {
if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
{
// move combat package with nearest target to the front
mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
}
package = mPackages.front();
mLastAiPackage = package->getTypeId();
}
else
{ {
mDone = true; mDone = true;
return; return;
} }
else if (mPackages.begin() != itActualCombat)
{
// move combat package with nearest target to the front
mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
}
} }
if (package->execute (actor,duration)) if (package->execute (actor,duration))