Fix for 2.6

dolkensp · Dec 22, 2016 · 1fd1bd2 · 1fd1bd2
1 parent fed74a2
commit 1fd1bd2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/HoloXPLOR.DataForge/CryXmlB/CryXmlSerializer.cs b/HoloXPLOR.DataForge/CryXmlB/CryXmlSerializer.cs
@@ -135,9 +135,17 @@ public static XmlDocument ReadStream(Stream inStream, ByteOrderEnum byteOrder =
                     throw new Exception("Unknown File Format"); // Unknown file format
                 }
 
-                String header = br.ReadCString();
+                String header = br.ReadFString(7);
 
-                if (header != "CryXmlB")
+                if (header == "CryXml" || header == "CryXmlB")
+                {
+                    br.ReadCString();
+                }
+                else if (header == "CRY3SDK")
+                {
+                    var bytes = br.ReadBytes(2);
+                }
+                else
                 {
                     throw new Exception("Unknown File Format");
                 }

diff --git a/HoloXPLOR.DataForge/DataForge.cs b/HoloXPLOR.DataForge/DataForge.cs
@@ -271,6 +271,11 @@ public void Save(String filename)
             {
                 var fileReference = record.FileName;
 
+                if (fileReference.Split('/').Length == 2)
+                {
+                    fileReference = fileReference.Split('/')[1];
+                }
+
                 if (!record.FileName.Contains(record.Name))
                 {
                     Console.WriteLine("Warning {0} doesn't match {1}", record.Name, record.FileName);