Merge branch 'no_more_i_yield' into 'master'

Explicitely add the initial actor to the set of its allies

See merge request OpenMW/openmw!1474

apps/openmw/mwmechanics/actors.cpp

@@ -451,6 +451,7 @@ namespace MWMechanics
         {
             std::set<MWWorld::Ptr> allySet;
             getActorsSidingWith(ptr, allySet);
+            allySet.insert(ptr);
             std::vector<MWWorld::Ptr> allies(allySet.begin(), allySet.end());
             for(const auto& ally : allies)
                 ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(targets);