(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00
parent 7b6c2f1fa8
commit 3d7a113d75
47 changed files with 651 additions and 461 deletions
@@ -38,6 +38,8 @@ namespace Barotrauma.Items.Components
        private Vector2 keyboardInput = Vector2.Zero;
        private float inputCumulation;

+        private bool? swapDestinationOrder;
+
        private bool levelStartSelected;
        public bool LevelStartSelected
        {
@@ -423,6 +425,15 @@ namespace Barotrauma.Items.Components

        public override void UpdateHUD(Character character, float deltaTime, Camera cam)
        {
+            if (swapDestinationOrder == null)
+            {
+                swapDestinationOrder = item.Submarine != null && item.Submarine.FlippedX;
+                if (swapDestinationOrder.Value)
+                {
+                    levelStartTickBox.RectTransform.SetAsLastChild();
+                }
+            }
+
            if (steerArea.Rect.Contains(PlayerInput.MousePosition))
            {
                if (!PlayerInput.KeyDown(InputType.Deselect) && !PlayerInput.KeyHit(InputType.Deselect))