Unstable 1.1.14.0

2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -99,10 +99,10 @@ namespace Barotrauma
                }))
                .Aggregate(TextManager.SpeciallyHandledCharCategory.None, (current, category) => current | category);

-        public ScalableFont(ContentXElement element, GraphicsDevice gd = null)
+        public ScalableFont(ContentXElement element, uint defaultSize = 14, GraphicsDevice gd = null)
            : this(
                element.GetAttributeContentPath("file")?.Value,
-                (uint)element.GetAttributeInt("size", 14),
+                (uint)element.GetAttributeInt("size", (int)defaultSize),
                gd,
                element.GetAttributeBool("dynamicloading", false),
                ExtractShccFromXElement(element))