(267e53638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:43:15 +03:00
parent b7e8407df5
commit 3d7b229385
18 changed files with 154 additions and 319 deletions
@@ -144,17 +144,6 @@ namespace Barotrauma.Items.Components
            }
        }

-        public Vector2 SteeringInput
-        {
-            get { return steeringInput; }
-            set
-            {
-                if (!MathUtils.IsValid(value)) return;
-                steeringInput.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
-                steeringInput.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
-            }
-        }
-
        public SteeringPath SteeringPath
        {
            if (!CanBeSelected) return false;
@@ -175,6 +164,12 @@ namespace Barotrauma.Items.Components
            set { posToMaintain = value; }
        }

+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
        struct ObstacleDebugInfo
        {
            public Vector2 Point1;