(99feac023) Unstable 0.9.704.0

2020-02-07 20:47:03 +02:00
parent 590619459b
commit 6754b9d5a2
104 changed files with 2224 additions and 1091 deletions
@@ -701,8 +701,16 @@ namespace Barotrauma

        public void MatchPivotToAnchor() => MatchPivotToAnchor(Anchor);

+
+        private Point? animTargetPos;
+        public Point AnimTargetPos
+        {
+            get { return animTargetPos ?? AbsoluteOffset; }
+        }
+
        public void MoveOverTime(Point targetPos, float duration)
        {
+            animTargetPos = targetPos;
            CoroutineManager.StartCoroutine(DoMoveAnimation(targetPos, duration));
        }
        public void ScaleOverTime(Point targetSize, float duration)
@@ -721,6 +729,7 @@ namespace Barotrauma
                yield return CoroutineStatus.Running;
            }
            AbsoluteOffset = targetPos;
+            animTargetPos = null;
            yield return CoroutineStatus.Success;
        }
        private IEnumerable<object> DoScaleAnimation(Point targetSize, float duration)