vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(59629f0e1) Fixed: ContentPackage path not being valid on MacOS

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-16 06:41:51 +03:00
parent 464aa46980
commit 42f287e254
23 changed files with 411 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/ContentPackage.cs
+7 -3
View File
@@ -362,11 +362,10 @@ namespace Barotrauma
case ContentType.Character:
XDocument doc = XMLExtensions.TryLoadXml(file.Path);
string speciesName = doc.Root.GetAttributeString("name", "");
//TODO: check non-default paths if defined
filePaths.Add(RagdollParams.GetDefaultFile(speciesName, this));
filePaths.Add(RagdollParams.GetDefaultFile(speciesName));
foreach (AnimationType animationType in Enum.GetValues(typeof(AnimationType)))
{
filePaths.Add(AnimationParams.GetDefaultFile(speciesName, animationType, this));
filePaths.Add(AnimationParams.GetDefaultFile(speciesName, animationType));
}
break;
}
@@ -492,6 +491,11 @@ namespace Barotrauma
public ContentFile(string path, ContentType type, Workshop.Item workShopItem = null)
{
Path = path;
#if OSX
Path = Path.Replace("\\", "/");
#endif
Type = type;
WorkShopItem = workShopItem;
}