(deee8cd6d) Merge branch 'dev' into human-ai

2019-05-16 05:23:20 +03:00
parent abd19f614f
commit 053ef60fc4
14 changed files with 176 additions and 396 deletions
@@ -21,7 +21,8 @@ namespace Barotrauma
        protected Vector2 position;
        protected Vector2 size;

-        protected bool removed;
+        private readonly Submarine submarine;
+        public Submarine Submarine => submarine;

        protected bool removed;

@@ -86,7 +87,7 @@ namespace Barotrauma
            position = worldPosition - new Vector2(-5.0f, 5.0f);
            if (hull.Submarine != null)
            {
-                Submarine = hull.Submarine;
+                submarine = hull.Submarine;
                position -= Submarine.Position;
            }