teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1374 from akortunov/guardfix

Browse source 
Disable AiPursue package for player's followers
This commit is contained in:
scrawl 2017-08-06 21:11:08 +00:00 committed by GitHub
commit ba72eb77f4
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -1152,7 +1152,19 @@ namespace MWMechanics
it->getClass().getNpcStats(*it).setCrimeId(id); it->getClass().getNpcStats(*it).setCrimeId(id);
if (!it->getClass().getCreatureStats(*it).getAiSequence().hasPackage(AiPackage::TypeIdPursue)) if (!it->getClass().getCreatureStats(*it).getAiSequence().hasPackage(AiPackage::TypeIdPursue))
{
// Player's followers should not try to arrest player
if (it->getClass().getCreatureStats(*it).getAiSequence().hasPackage(AiPackage::TypeIdFollow))
{
std::set<MWWorld::Ptr> playerFollowers;
getActorsSidingWith(player, playerFollowers);
if (playerFollowers.find(*it) != playerFollowers.end())
continue;
}
it->getClass().getCreatureStats(*it).getAiSequence().stack(AiPursue(player), *it); it->getClass().getCreatureStats(*it).getAiSequence().stack(AiPursue(player), *it);
}
} }
else else
{ {