(7ee8dbc11) v0.9.8.0

Barotrauma/BarotraumaClient/ClientSource/Map/Hull.cs

@@ -248,8 +248,6 @@ namespace Barotrauma
 
             if (!editing && !GameMain.DebugDraw) return;
 
-            if (aiTarget != null) aiTarget.Draw(spriteBatch);
-
            Rectangle drawRect =
                 Submarine == null ? rect : new Rectangle((int)(Submarine.DrawPosition.X + rect.X), (int)(Submarine.DrawPosition.Y + rect.Y), rect.Width, rect.Height);
 

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectPrefab.cs

@@ -4,6 +4,7 @@ using Barotrauma.SpriteDeformations;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
@@ -120,7 +121,7 @@ namespace Barotrauma
 
             SerializableProperty.SerializeProperties(this, element);
 
-            foreach (XElement subElement in element.Elements())
+            foreach (XElement subElement in element.Elements().ToList())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -139,7 +140,7 @@ namespace Barotrauma
                         break;
                 }
             }
-            
+
             foreach (LightSourceParams lightSourceParams in LightSourceParams)
             {
                 var lightElement = new XElement("LightSource");

Barotrauma/BarotraumaClient/ClientSource/Map/LinkedSubmarine.cs

@@ -12,10 +12,10 @@ namespace Barotrauma
     {
         public override void Draw(SpriteBatch spriteBatch, bool editing, bool back = true)
         {
-            if (!editing || wallVertices == null) return;
+            if (!editing || wallVertices == null) { return; }
 
-            Color color = (IsHighlighted) ? GUI.Style.Orange : GUI.Style.Green;
-            if (IsSelected) color = GUI.Style.Red;
+            Color color = IsHighlighted ? GUI.Style.Orange : GUI.Style.Green;
+            if (IsSelected) { color = GUI.Style.Red; }
 
             Vector2 pos = Position;
 
@@ -37,11 +37,7 @@ namespace Barotrauma
             GUI.DrawLine(spriteBatch, pos + Vector2.UnitY * 50.0f, pos - Vector2.UnitY * 50.0f, color, 0.0f, 5);
             GUI.DrawLine(spriteBatch, pos + Vector2.UnitX * 50.0f, pos - Vector2.UnitX * 50.0f, color, 0.0f, 5);
 
-            Rectangle drawRect = rect;
-            drawRect.Y = -rect.Y;
-            GUI.DrawRectangle(spriteBatch, drawRect, GUI.Style.Red, true);
-
-            if (!Item.ShowLinks) return;
+            if (!Item.ShowLinks) { return; }
 
             foreach (MapEntity e in linkedTo)
             {

Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs

@@ -350,8 +350,6 @@ namespace Barotrauma
                         }
                     }
                 }
-
-                AiTarget?.Draw(spriteBatch);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Map/Submarine.cs

@@ -222,7 +222,7 @@ namespace Barotrauma
 
                     GUI.DrawRectangle(spriteBatch, worldBorders, Color.White, false, 0, 5);
 
-                    if (sub.subBody.PositionBuffer.Count < 2) continue;
+                    if (sub.subBody == null || sub.subBody.PositionBuffer.Count < 2) continue;
 
                     Vector2 prevPos = ConvertUnits.ToDisplayUnits(sub.subBody.PositionBuffer[0].Position);
                     prevPos.Y = -prevPos.Y;