From 56dfa615e1e11539842350e4794f4247f7308135 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Thu, 13 Apr 2017 03:57:59 +0900
Subject: [PATCH] Minor changes to getActorsSidingWith

---
 apps/openmw/mwmechanics/actors.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 89cff3fa1..80564de9f 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1594,17 +1594,16 @@ namespace MWMechanics
     }
 
     void Actors::getActorsSidingWith(const MWWorld::Ptr &actor, std::set<MWWorld::Ptr>& out, std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >& cachedAllies) {
-        std::list<MWWorld::Ptr> followers = getActorsSidingWith(actor);
-
         // If we have already found actor's allies, use the cache
         std::map<const MWWorld::Ptr, const std::set<MWWorld::Ptr> >::const_iterator search = cachedAllies.find(actor);
         if (search != cachedAllies.end())
-            out = search->second;
+            out.insert(search->second.begin(), search->second.end());
         else
         {
+            std::list<MWWorld::Ptr> followers = getActorsSidingWith(actor);
             for (std::list<MWWorld::Ptr>::iterator it = followers.begin(); it != followers.end(); ++it)
                 if (out.insert(*it).second)
-                    getActorsSidingWith(*it, out);
+                    getActorsSidingWith(*it, out, cachedAllies);
 
             // Cache ptrs and their sets of allies
             cachedAllies.insert(std::make_pair(actor, out));