Merge pull request #1374 from akortunov/guardfix

Disable AiPursue package for player's followers
8 years ago · ba72eb77f4
parent 7f5b615295 72ce118d02
commit ba72eb77f4
1 changed files with 12 additions and 0 deletions
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@ -1152,7 +1152,19 @@ namespace MWMechanics
                it->getClass().getNpcStats(*it).setCrimeId(id);

                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);
+                }
            }
            else
            {