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

stopCombat fix

Browse source
This commit is contained in:
scrawl 2015-01-05 19:33:51 +01:00
parent 365bb3d3f0
commit c343a5c803
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,19 +125,23 @@ bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
void AiSequence::stopCombat() void AiSequence::stopCombat()
{ {
while (getTypeId() == AiPackage::TypeIdCombat) for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); )
{ {
delete *mPackages.begin(); if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
mPackages.erase (mPackages.begin()); it = mPackages.erase(it);
else
++it;
} }
} }
void AiSequence::stopPursuit() void AiSequence::stopPursuit()
{ {
while (getTypeId() == AiPackage::TypeIdPursue) for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); )
{ {
delete *mPackages.begin(); if ((*it)->getTypeId() == AiPackage::TypeIdPursue)
mPackages.erase (mPackages.begin()); it = mPackages.erase(it);
else
++it;
} }
} }