AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-27 15:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't treat actors as following if another non-combat AiPackage precedes (Fixes #1843)

Browse Source
This commit is contained in:
scrawl 2014-08-24 22:39:46 +02:00
parent 7714192e28
commit 854491ac15
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/actors.cpp
View File

@ -1402,6 +1402,7 @@ namespace MWMechanics
if (stats.isDead()) if (stats.isDead())
continue; continue;
// An actor counts as following if AiFollow is the current AiPackage, or there are only Combat packages before the AiFollow package
for (std::list<MWMechanics::AiPackage*>::const_iterator it = stats.getAiSequence().begin(); it != stats.getAiSequence().end(); ++it) for (std::list<MWMechanics::AiPackage*>::const_iterator it = stats.getAiSequence().begin(); it != stats.getAiSequence().end(); ++it)
{ {
if ((*it)->getTypeId() == MWMechanics::AiPackage::TypeIdFollow) if ((*it)->getTypeId() == MWMechanics::AiPackage::TypeIdFollow)
@ -1412,6 +1413,8 @@ namespace MWMechanics
if (followTarget == actor) if (followTarget == actor)
list.push_back(iter->first); list.push_back(iter->first);
} }
else if ((*it)->getTypeId() != MWMechanics::AiPackage::TypeIdCombat)
break;
} }
} }
return list; return list;