Selecting stairs based on WorldRect in editor, disable input if window not active, disable traveling if no locations are selected

2016-01-27 22:27:51 +02:00
parent 8cc12b6988
commit 7637bc441f
21 changed files with 95 additions and 77 deletions
@@ -136,7 +136,7 @@ namespace Barotrauma.Items.Components
                ignoredBodies.Add(limb.body.FarseerBody);
            }

-            Vector2 rayStart = item.WorldPosition + TransformedBarrelPos;
+            Vector2 rayStart = item.WorldPosition;
            Vector2 rayEnd = targetPosition;

            Body targetBody = Submarine.PickBody(
@@ -351,7 +351,7 @@ namespace Barotrauma.Items.Components

                if (selectedNodeIndex == null && draggingWire == null)// && !MapEntity.SelectedAny)
                {
-                    if (PlayerInput.LeftButtonDown() && PlayerInput.GetOldMouseState.LeftButton == Microsoft.Xna.Framework.Input.ButtonState.Released)
+                    if (PlayerInput.LeftButtonClicked())
                    {
                        MapEntity.DisableSelect = true;
                        MapEntity.SelectEntity(item);