Fix up global vector clearing

src/new/spawnmanager/spawnmanager.cpp

@@ -941,16 +941,3 @@ int SpawnManagerClass::Preparing_Count()
     }
     return count;
 }
-
-/**
- *  Removes all SpawnManagers from the game world.
- *
- *  @author: ZivDero
- */
-void SpawnManagerClass::Clear_All()
-{
-    for (int i = 0; i < SpawnManagers.Count(); ++i)
-        delete SpawnManagers[i];
-
-    SpawnManagers.Clear();
-}

src/new/spawnmanager/spawnmanager.h

@@ -101,8 +101,6 @@ class DECLSPEC_UUID(UUID_SPAWN_MANAGER)
     int Docked_Count();
     int Preparing_Count();
 
-    static void Clear_All();
-
     SpawnManagerClass(const SpawnManagerClass&) = delete;
     SpawnManagerClass& operator= (const SpawnManagerClass&) = delete;
 

src/vinifera/vinifera_functions.cpp

@@ -668,10 +668,6 @@ bool Vinifera_Shutdown()
      *  Cleanup global heaps/vectors.
      */
     TheaterTypes.Clear();
-    ArmorTypes.Clear();
-    RocketTypes.Clear();
-    SpawnManagerClass::Clear_All();
-    MouseTypes.Clear();
 
     /**
      *  Cleanup global extension instances.

src/vinifera/vinifera_hooks.cpp

@@ -51,6 +51,8 @@
 #include "ebolt.h"
 #include "kamikazetracker.h"
 #include "spawnmanager.h"
+#include "armortype.h"
+#include "rockettype.h"
 
 
 /**
@@ -78,21 +80,33 @@ static void _Detach_This_From_All_Intercept(TARGET target, bool all)
  */
 static void _Free_Heaps_Intercept()
 {
+    Free_Heaps();
+
     /**
      *  Cleanup global heaps/vectors.
      */
     ++ScenarioInit;
 
+    while (ArmorTypes.Count()) {
+        delete ArmorTypes[0];
+    }
+    Remove_All_Inactive();
+
+    while (RocketTypes.Count()) {
+        delete RocketTypes[0];
+    }
+    Remove_All_Inactive();
+
+    while (SpawnManagers.Count()) {
+        delete SpawnManagers[0];
+    }
+    Remove_All_Inactive();
+
     EBoltClass::Clear_All();
-    ArmorTypes.Clear();
-    RocketTypes.Clear();
-    SpawnManagerClass::Clear_All();
 
     Extension::Free_Heaps();
 
     --ScenarioInit;
-
-    Free_Heaps();
 }
 
 

src/vinifera/vinifera_saveload.cpp

@@ -407,11 +407,6 @@ bool Vinifera_Get_All(IStream *pStm, bool load_net)
     DEBUG_INFO("About to call Clear_Scenario()...\n");
     Clear_Scenario();
 
-    /**
-     *  Clear the ArmorTypes heap.
-     */
-    ArmorTypes.Clear();
-
     /**
      *  Now the scenario data has been cleaned up, we can now tell the extension
      *  hooks that we will be creating the extension classes via the class factories.