(db42ef494) Don't allow combat priority go over 100.

2019-05-16 05:09:51 +03:00
parent 171c42f077
commit 7ebb0be29b
12 changed files with 91 additions and 16 deletions
@@ -164,6 +164,8 @@ namespace Barotrauma

        public bool IgnoreLayoutGroups;

+        public bool IgnoreLayoutGroups;
+
        public virtual ScalableFont Font
        {
            get;
@@ -143,6 +143,12 @@ namespace Barotrauma
            Content = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), InnerFrame.RectTransform, Anchor.Center)) { AbsoluteSpacing = 5 };
            Tag = tag;

+            InnerFrame = new GUIFrame(new RectTransform(new Point(width, height), RectTransform, Anchor.Center) { IsFixedSize = false }, style: null);
+            GUI.Style.Apply(InnerFrame, "", this);
+
+            Content = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), InnerFrame.RectTransform, Anchor.Center)) { AbsoluteSpacing = 5 };
+            Tag = tag;
+
            if (height == 0)
            {
                string wrappedText = ToolBox.WrapText(text, Content.Rect.Width, GUI.Font);