From 6322d7675d4842774fff62412e218baf5d515ac0 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 31 Dec 2013 04:48:55 +0000
Subject: [PATCH] [Add] Clear the escorts on hyperspace (should prevent it from
 eventually bloating).

---
 dat/ship.xml  | 44 +++++++++++++++++++++++++++++++++++++++-----
 dat/start.xml |  2 +-
 src/space.c   |  9 +++++++++
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/dat/ship.xml b/dat/ship.xml
index b4ba099..28bbe72 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Ships>
+ <ship name="TestShip">
+  <GFX>lancelot</GFX>
+  <GUI>minimal</GUI>
+  <sound>engine</sound>
+  <class>civ medium</class>
+  <price>500000</price>
+  <fabricator>Nexus</fabricator>
+  <tech>7</tech>
+  <description>!Used for testing!</description>
+  <movement>
+   <thrust>220</thrust>
+   <turn>135</turn>
+   <speed>260</speed>
+  </movement>
+  <health>
+   <shield>340</shield>
+   <armour>300</armour>
+   <energy>380</energy>
+   <shield_regen>380</shield_regen>
+   <armour_regen>360</armour_regen>
+   <energy_regen>1000</energy_regen>
+  </health>
+  <characteristics>
+   <crew>4</crew>
+   <mass>95</mass>
+   <fuel>1000</fuel>
+   <cap_weapon>800</cap_weapon>
+   <cap_cargo>6000</cap_cargo>
+  </characteristics>
+  <outfits>
+    <outfit quantity="1">Lancelot Fighter Bay</outfit>
+    <outfit quantity="2">Lancelot Fighter</outfit>
+    <outfit quantity="2">Ripper MK2</outfit>
+    <outfit quantity="2">Ragnarok Beam</outfit>
+    <outfit quantity="2">Orion Beam</outfit>
+   <outfit quantity="1">Headhunter Launcher</outfit>
+   <outfit quantity="20">Headhunter</outfit>
+  </outfits>
+ </ship>
  <ship name="Llama">
   <GFX>llama</GFX>
   <GUI>minimal</GUI>
@@ -238,11 +277,6 @@
    <cap_cargo>10</cap_cargo>
   </characteristics>
   <outfits>
-    <outfit quantity="1">Lancelot Fighter Bay</outfit>
-    <outfit quantity="2">Lancelot Fighter</outfit>
-    <outfit quantity="2">Ripper MK2</outfit>
-    <outfit quantity="2">Ragnarok Beam</outfit>
-    <outfit quantity="2">Orion Beam</outfit>
    <outfit quantity="1">Headhunter Launcher</outfit>
    <outfit quantity="20">Headhunter</outfit>
   </outfits>
diff --git a/dat/start.xml b/dat/start.xml
index a44543e..489ee49 100644
--- a/dat/start.xml
+++ b/dat/start.xml
@@ -2,7 +2,7 @@
 <Start>
  <name>Dark Tides</name>
  <player>
-  <ship>Lancelot</ship>
+  <ship>TestShip</ship>
   <credits>
    <low>10000</low>
    <high>20000</high>
diff --git a/src/space.c b/src/space.c
index a5dbb72..17161db 100644
--- a/src/space.c
+++ b/src/space.c
@@ -507,6 +507,15 @@ void space_init(const char* sysname) {
   spfx_clear();     /* Remove of explosions. */
   space_spawn = 1;  /* Spawn is enabled by default. */
 
+  /* Clear player escorts since they don't automatically follow. */
+  if(player) {
+    player->escorts = 0;
+    if(player->escorts) {
+      free(player->escorts);
+      player->escorts = NULL;
+    }
+  }
+
   if((sysname == NULL) && (cur_system == NULL))
     ERR("Cannot reinit system if there is no system previously loaded");
   else if(sysname != NULL) {