v0.18.15.1

2022-08-09 13:37:15 -03:00
parent 2e2663a175
commit b17019db95
5 changed files with 30 additions and 14 deletions
@@ -232,8 +232,7 @@ namespace Barotrauma
                {
                    foreach (MapEntity e in mapEntityList)
                    {
-                        if (!e.SelectableInEditor) continue;
-
+                        if (!e.SelectableInEditor) { continue; }
                        if (e.IsMouseOn(position))
                        {
                            int i = 0;
@@ -243,9 +242,7 @@ namespace Barotrauma
                            {
                                i++;
                            }
-
                            highlightedEntities.Insert(i, e);
-
                            if (i == 0) highLightedEntity = e;
                        }
                    }
@@ -741,7 +738,14 @@ namespace Barotrauma
        /// </summary>
        public static void DrawSelecting(SpriteBatch spriteBatch, Camera cam)
        {
-            if (GUI.MouseOn != null) return;
+            if (Screen.Selected is SubEditorScreen subEditor)
+            {
+                if (subEditor.IsMouseOnEditorGUI()) { return; }
+            }
+            else if (GUI.MouseOn != null) 
+            { 
+                return; 
+            }

            Vector2 position = PlayerInput.MousePosition;
            position = cam.ScreenToWorld(position);