Fix for UnkUshort ordering in XML/AWC conversion

This commit is contained in:
dexy 2020-03-08 18:18:40 +11:00
parent 44756e0277
commit 665a2d67e5

View File

@ -310,7 +310,6 @@ namespace CodeWalker.GameFiles
Version = (ushort)Xml.GetChildUIntAttribute(node, "Version"); Version = (ushort)Xml.GetChildUIntAttribute(node, "Version");
MultiChannelFlag = Xml.GetChildBoolAttribute(node, "MultiChannel"); MultiChannelFlag = Xml.GetChildBoolAttribute(node, "MultiChannel");
var unkUshorts = new List<ushort>();
var hasUshorts = false; var hasUshorts = false;
var snode = node.SelectSingleNode("Streams"); var snode = node.SelectSingleNode("Streams");
@ -325,7 +324,6 @@ namespace CodeWalker.GameFiles
slist.Add(stream); slist.Add(stream);
hasUshorts = hasUshorts || stream.UnkUshort.HasValue; hasUshorts = hasUshorts || stream.UnkUshort.HasValue;
unkUshorts.Add(stream.UnkUshort ?? 0);
if (MultiChannelFlag && (stream.StreamFormatChunk != null) && (stream.Hash == 0)) if (MultiChannelFlag && (stream.StreamFormatChunk != null) && (stream.Hash == 0))
{ {
@ -342,6 +340,14 @@ namespace CodeWalker.GameFiles
if (hasUshorts) if (hasUshorts)
{ {
var unkUshorts = new List<ushort>();
if (Streams != null)
{
foreach (var stream in Streams)
{
unkUshorts.Add(stream.UnkUshort ?? 0);
}
}
UnkUshorts = unkUshorts.ToArray(); UnkUshorts = unkUshorts.ToArray();
UnkUshortsFlag = true; UnkUshortsFlag = true;
} }