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

2019-06-11 21:46:21 +03:00
parent dd1ce8bf2f
commit 5f497543a4
9 changed files with 154 additions and 77 deletions
@@ -82,7 +82,7 @@ namespace Barotrauma
            center.Y -= center.Y % Submarine.GridSize.Y;

            MapEntity.SelectedList.Clear();
-            MapEntity.SelectedList.AddRange(assemblyEntities);
+            assemblyEntities.ForEach(e => MapEntity.AddSelection(e));

            foreach (MapEntity mapEntity in assemblyEntities)
            {
@@ -478,6 +478,45 @@ namespace Barotrauma
                return true;
            };
        }
+
+        public static void AddSelection(MapEntity entity)
+        {
+            if (selectedList.Contains(entity)) { return; }
+            selectedList.Add(entity);
+            if (entity is Item i)
+            {
+                var door = i.GetComponent<Door>();
+                if (door != null)
+                {
+                    var gap = door.LinkedGap;
+                    if (gap != null)
+                    {
+                        door.RefreshLinkedGap();
+                        if (!selectedList.Contains(gap))
+                        {
+                            selectedList.Add(gap);
+                        }
+                    }
+                }
+            }
+        }
+
+        public static void RemoveSelection(MapEntity entity)
+        {
+            selectedList.Remove(entity);
+            if (entity is Item i)
+            {
+                var door = i.GetComponent<Door>();
+                if (door != null)
+                {
+                    var gap = door.LinkedGap;
+                    if (gap != null)
+                    {
+                        selectedList.Remove(gap);
+                    }
+                }
+            }
+        }
        
        static partial void UpdateAllProjSpecific(float deltaTime)
        {
@@ -546,6 +585,7 @@ namespace Barotrauma

        public static void UpdateEditor(Camera cam)
        {
+            FilteredSelectedList.Clear();
            if (highlightedListBox != null) highlightedListBox.UpdateManually((float)Timing.Step);

            if (editingHUD != null)
@@ -563,11 +603,16 @@ namespace Barotrauma
            }

            if (selectedList.Count == 0) return;
-
-            if (editingHUD != null)
+            foreach (var e in selectedList)
            {
-                selectedList[0].UpdateEditing(cam);
-                if (selectedList[0].ResizeHorizontal || selectedList[0].ResizeVertical)
+                if (e is Gap) { continue; }
+                FilteredSelectedList.Add(e);
+            }
+            var first = FilteredSelectedList.FirstOrDefault();
+            if (first != null)
+            {
+                first.UpdateEditing(cam);
+                if (first.ResizeHorizontal || first.ResizeVertical)
                {
                    first.UpdateResizing(cam);
                }