v1.7.7.0 (Winter Update 2024)

2024-12-11 13:26:13 +02:00
parent 7d5b7a310a
commit f6349b2175
256 changed files with 4794 additions and 1653 deletions
@@ -8,6 +8,8 @@ namespace Barotrauma.Items.Components
 {
    partial class Sonar : Powered, IServerSerializable, IClientSerializable
    {
+        public static List<Sonar> SonarList = new List<Sonar>();
+
        public enum Mode
        {
            Active,
@@ -167,6 +169,7 @@ namespace Barotrauma.Items.Components
            IsActive = true;
            InitProjSpecific(element);
            CurrentMode = Mode.Passive;
+            SonarList.Add(this);
        }

        partial void InitProjSpecific(ContentXElement element);
@@ -379,6 +382,29 @@ namespace Barotrauma.Items.Components
            }
        }

+        protected override void RemoveComponentSpecific()
+        {
+            base.RemoveComponentSpecific();
+#if CLIENT
+            sonarBlip?.Remove();
+            pingCircle?.Remove();
+            directionalPingCircle?.Remove();
+            screenOverlay?.Remove();
+            screenBackground?.Remove();
+            lineSprite?.Remove();
+
+            foreach (var t in targetIcons.Values)
+            {
+                t.Item1.Remove();
+            }
+            targetIcons.Clear();
+
+            MineralClusters = null;
+#endif
+            SonarList.Remove(this);
+        }
+
+
        public void ServerEventRead(IReadMessage msg, Client c)
        {
            bool isActive = msg.ReadBoolean();