Add a temporary routine to clean up after some invalid god companions

This should prevent one crash caused by saves containing cloned companions
and allow those players to continue their games, but should be unnecessary
once all cloning bugs are fully quashed.

1 files changed, 17 insertions, 0 deletions

diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc
index 2cd21b7159..8b7efca773 100644
--- a/crawl-ref/source/godcompanions.cc
+++ b/crawl-ref/source/godcompanions.cc
@@ -177,3 +177,20 @@ void wizard_list_companions()
                 mon->mid, branches[comp->level.branch].abbrevname, comp->level.depth);
     }
 }
+
+#if TAG_MAJOR_VERSION == 34
+// A temporary routine to clean up some references to invalid companions and
+// prevent crashes on load. Should be unnecessary once the cloning bugs that
+// allow the creation of these invalid companions are fully mopped up
+void fixup_bad_companions()
+{
+    for(map<mid_t, companion>::iterator i = companion_list.begin();
+        i != companion_list.end();)
+    {
+        if (invalid_monster_type(i->second.mons.mons.type))
+            companion_list.erase(i++);
+        else
+            ++i;
+    }
+}
+#endif