(29d8edbb9) Use a sprite to draw the lines on the sonar display (looks better than GUI.DrawLine)

Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs

@@ -1066,6 +1066,8 @@ namespace Barotrauma
 
         private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
 
+        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
+
         //goes through all the AItargets, evaluates how preferable it is to attack the target,
         //whether the Character can see/hear the target and chooses the most preferable target within
         //sight/hearing range

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -2587,6 +2587,10 @@ namespace Barotrauma
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif
 
+#if CLIENT
+            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
+#endif
+
 #if CLIENT
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Sonar.cs

@@ -47,8 +47,9 @@ namespace Barotrauma.Items.Components
         //was the last ping sent with directional pinging
         private bool isLastPingDirectional;
 
-        private readonly Sprite pingCircle, directionalPingCircle, screenOverlay, screenBackground;
-        private readonly Sprite sonarBlip;
+        private Sprite pingCircle, directionalPingCircle, screenOverlay, screenBackground;
+        private Sprite sonarBlip;
+        private Sprite lineSprite;
 
         private bool aiPingCheckPending;
 
@@ -121,29 +122,7 @@ namespace Barotrauma.Items.Components
             : base(item, element)
         {
             connectedTransducers = new List<ConnectedTransducer>();
-
-            foreach (XElement subElement in element.Elements())
-            {
-                switch (subElement.Name.ToString().ToLowerInvariant())
-                {
-                    case "pingcircle":
-                        pingCircle = new Sprite(subElement);
-                        break;
-                    case "directionalpingcircle":
-                        directionalPingCircle = new Sprite(subElement);
-                        break;
-                    case "screenoverlay":
-                        screenOverlay = new Sprite(subElement);
-                        break;
-                    case "screenbackground":
-                        screenBackground = new Sprite(subElement);
-                        break;
-                    case "blip":
-                        sonarBlip = new Sprite(subElement);
-                        break;
-                }
-            }
-            
+                        
             IsActive = false;
             InitProjSpecific(element);
         }
@@ -215,6 +194,7 @@ namespace Barotrauma.Items.Components
             directionalPingCircle?.Remove();
             screenOverlay?.Remove();
             screenBackground?.Remove();
+            lineSprite?.Remove();
         }
 
         public override bool AIOperate(float deltaTime, Character character, AIObjectiveOperateItem objective)

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -172,19 +172,6 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
-        public override void OnItemLoaded()
-        {
-            sonar = item.GetComponent<Sonar>();
-        }
-
-        public override bool Select(Character character)
-        {
-            if (!CanBeSelected) return false;
-
-            user = character;
-            return true;
-        }
-
         public override void Update(float deltaTime, Camera cam)
         {
             networkUpdateTimer -= deltaTime;