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

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -377,9 +377,13 @@ namespace Barotrauma.Items.Components

        public virtual void UpdateHUD(Character character, float deltaTime, Camera cam) { }

-        public ItemComponent GetLinkUIToComponent()
+        public virtual void CreateEditingHUD(SerializableEntityEditor editor)
        {
-            if (string.IsNullOrEmpty(LinkUIToComponent))
+        }
+
+        private bool LoadElemProjSpecific(XElement subElement)
+        {
+            switch (subElement.Name.ToString().ToLowerInvariant())
            {
                case "guiframe":
                    if (subElement.Attribute("rect") != null)