GUI elements now respect render order + some minor distance comparison optimization

2016-11-15 22:26:36 -03:00
parent 3c57b9d945
commit d2c17274fe
39 changed files with 441 additions and 47 deletions
@@ -1139,6 +1139,27 @@ namespace Barotrauma
            }
        }

+        public override void AddToGUIUpdateList()
+        {
+            if (condition <= 0.0f)
+            {
+                FixRequirement.AddToGUIUpdateList();
+                return;
+            }
+
+            if (HasInGameEditableProperties)
+            {
+                if (editingHUD != null) editingHUD.AddToGUIUpdateList();
+            }
+
+            foreach (ItemComponent ic in components)
+            {
+                ic.AddToGUIUpdateList();
+            }
+
+            if (Screen.Selected is EditMapScreen && editingHUD != null) editingHUD.AddToGUIUpdateList();
+        }
+
        public virtual void UpdateHUD(Camera cam, Character character)
        {
            if (condition <= 0.0f)
@@ -1388,7 +1409,7 @@ namespace Barotrauma
                    ic.ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);
                    ic.PlaySound(ActionType.OnPicked, picker.WorldPosition);

-                    if (picker==Character.Controlled) GUIComponent.MouseOn = null;
+                    if (picker==Character.Controlled) GUIComponent.ForceMouseOn(null);

                    if (ic.CanBeSelected) selected = true;
                }