(6f4bea467) Updated doors

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

@@ -47,9 +47,8 @@ namespace Barotrauma.Items.Components
         //was the last ping sent with directional pinging
         private bool isLastPingDirectional;
 
-        private Sprite pingCircle, directionalPingCircle, screenOverlay, screenBackground;
-        private Sprite sonarBlip;
-        private Sprite lineSprite;
+        private readonly Sprite pingCircle, directionalPingCircle, screenOverlay, screenBackground;
+        private readonly Sprite sonarBlip;
 
         private bool aiPingCheckPending;
 
@@ -87,16 +86,6 @@ namespace Barotrauma.Items.Components
             get { return zoom; }
         }
 
-        //TODO: remove, only for testing
-#if DEBUG
-        [Serialize(false, false), Editable]
-        public bool DynamicDockingIndicator
-        {
-            get;
-            set;
-        }
-#endif
-
         public override bool IsActive
         {
             get
@@ -122,7 +111,29 @@ 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);
         }
@@ -194,7 +205,6 @@ namespace Barotrauma.Items.Components
             directionalPingCircle?.Remove();
             screenOverlay?.Remove();
             screenBackground?.Remove();
-            lineSprite?.Remove();
         }
 
         public override bool AIOperate(float deltaTime, Character character, AIObjectiveOperateItem objective)
@@ -249,24 +259,15 @@ namespace Barotrauma.Items.Components
             int clockDir = (int)Math.Round((angle / MathHelper.TwoPi) * 12);
             if (clockDir == 0) clockDir = 12;
 
-            return TextManager.Get("SubDirOClock").Replace("[dir]", clockDir.ToString());
+            return TextManager.Get("roomname.subdiroclock").Replace("[dir]", clockDir.ToString());
         }
 
-        private Vector2 GetTransducerPos()
+        private Vector2 GetTransducerCenter()
         {
-            if (!UseTransducers || connectedTransducers.Count == 0)
-            {
-                //use the position of the sub if the item is static (no body) and inside a sub
-                return item.Submarine != null && item.body == null ? item.Submarine.WorldPosition : item.WorldPosition;
-            }
-
+            if (!UseTransducers || connectedTransducers.Count == 0) return Vector2.Zero;
             Vector2 transducerPosSum = Vector2.Zero;
             foreach (ConnectedTransducer transducer in connectedTransducers)
             {
-                if (transducer.Transducer.Item.Submarine != null)
-                {
-                    return transducer.Transducer.Item.Submarine.WorldPosition;
-                }
                 transducerPosSum += transducer.Transducer.Item.WorldPosition;
             }
             return transducerPosSum / connectedTransducers.Count;

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

@@ -172,6 +172,19 @@ 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;
@@ -474,9 +487,7 @@ namespace Barotrauma.Items.Components
                     if (!posToMaintain.HasValue)
                     {
                         unsentChanges = true;
-                        posToMaintain = controlledSub != null ?
-                            controlledSub.WorldPosition :
-                            item.Submarine == null ? item.WorldPosition : item.Submarine.WorldPosition;
+                        posToMaintain = controlledSub == null ? item.WorldPosition : controlledSub.WorldPosition;
                     }
 
                     if (!AutoPilot || !MaintainPos) unsentChanges = true;