mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

travis fix #3 :(

Browse Source
This commit is contained in:
mrcheko 2014-05-18 16:10:14 +04:00
parent 74697f8116
commit 66307dd889
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,14 +133,14 @@ void AiSequence::execute (const MWWorld::Ptr& actor,float duration)
// if active package is combat one, choose nearest target // if active package is combat one, choose nearest target
if (mLastAiPackage == AiPackage::TypeIdCombat) if (mLastAiPackage == AiPackage::TypeIdCombat)
{ {
std::list<AiPackage *>::const_iterator itActualCombat; std::list<AiPackage *>::iterator itActualCombat;
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);
const AiCombat *package; const AiCombat *package;
for(std::list<AiPackage *>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it) for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end(); ++it)
{ {
package = static_cast<const AiCombat *>(*it); package = static_cast<const AiCombat *>(*it);
@ -159,9 +159,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor,float duration)
if (mPackages.begin() != itActualCombat) if (mPackages.begin() != itActualCombat)
{ {
// move combat package with nearest target to the front // move combat package with nearest target to the front
AiPackage *package = (*itActualCombat)->clone(); mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
mPackages.erase(itActualCombat);
mPackages.push_front(package);
} }
} }