Unstable 0.1300.1.11

2021-04-26 21:07:23 +03:00
parent 841d755394
commit 2c750282ec
76 changed files with 671 additions and 396 deletions
@@ -131,7 +131,12 @@ namespace Barotrauma

        public static string GetFolder(XDocument doc, string filePath)
        {
-            var folder = doc.Root?.Element("animations")?.GetAttributeString("folder", string.Empty);
+            var root = doc.Root;
+            if (root?.IsOverride() ?? false)
+            {
+                root = root.FirstElement();
+            }
+            var folder = root?.Element("animations")?.GetAttributeString("folder", string.Empty);
            if (string.IsNullOrEmpty(folder) || folder.Equals("default", StringComparison.OrdinalIgnoreCase))
            {
                folder = Path.Combine(Path.GetDirectoryName(filePath), "Animations");