Properly recall Yred enslaved souls from off-level

This fixes #6794

1 files changed, 16 insertions, 0 deletions

diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc
index a6fd67df8f..29d44e0b45 100644
--- a/crawl-ref/source/godcompanions.cc
+++ b/crawl-ref/source/godcompanions.cc
@@ -37,6 +37,22 @@ void remove_companion(monster* mons)
     companion_list.erase(mons->mid);
 }
 
+void remove_enslaved_soul_companion()
+{
+    for (map<mid_t, companion>::iterator i = companion_list.begin();
+        i != companion_list.end(); ++i)
+    {
+        monster* mons = monster_by_mid(i->first);
+        if (!mons)
+            mons = &i->second.mons.mons;
+        if (mons_enslaved_soul(mons))
+        {
+            remove_companion(mons);
+            return;
+        }
+    }
+}
+
 void remove_all_companions(god_type god)
 {
     for (map<mid_t, companion>::iterator i = companion_list.begin();