Made XML readers more tolerant to comments

Author: dexyfex

CodeWalker.Core/GameFiles/GameFileCache.cs

@@ -350,6 +350,7 @@ private void InitDlcList()
                 {
                     foreach (XmlNode itemnode in pathsnode.ChildNodes)
                     {
+                        if (itemnode.NodeType != XmlNodeType.Element) continue;
                         DlcPaths.Add(itemnode.InnerText.ToLowerInvariant().Replace('\\', '/').Replace("platform:", "x64"));
                     }
                 }

CodeWalker.Core/GameFiles/MetaTypes/XmlMeta.cs

@@ -828,6 +828,8 @@ private static Array_Structure TraverseArrayStructure(XmlNode node, MetaBuilder
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
+
                 var struc = Traverse(cnode, mb, type);
 
                 if (struc != null)
@@ -845,6 +847,8 @@ private static Array_StructurePointer TraverseArrayStructurePointer(XmlNode node
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
+
                 var type = (MetaName)(uint)GetHash(cnode.Attributes["type"].Value);
                 var struc = Traverse(cnode, mb, type);
 
@@ -1018,6 +1022,7 @@ private static Array_uint TraverseHashArray(XmlNode node, MetaBuilder mb)
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
                 var val = GetHash(cnode.InnerText);
                 items.Add(val);
             }
@@ -1073,6 +1078,7 @@ private static XmlNode GetEntryNode(XmlNodeList nodes, MetaStructureEntryInfo_s
         {
             foreach (XmlNode node in nodes)
             {
+                if (node.NodeType != XmlNodeType.Element) continue;
                 if (GetHash(node.Name) == (uint)entry.EntryNameHash)
                 {
                     return node;

CodeWalker.Core/GameFiles/MetaTypes/XmlPso.cs

@@ -389,6 +389,7 @@ private static void TraverseMap(XmlNode node, PsoBuilder pb, PsoStructureEntryIn
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
                 var kattr = cnode.Attributes["key"].Value;
                 var tattr = cnode.Attributes["type"].Value;//CW invention for convenience..!
                 var khash = (MetaName)(uint)GetHash(kattr);
@@ -723,6 +724,8 @@ private static void TraverseArray(XmlNode node, PsoBuilder pb, PsoStructureEntry
                             arrEntry.DataOffset = entry.DataOffset;//slight hack for traversing array array
                             foreach (XmlNode cnode in node.ChildNodes)
                             {
+                                if (cnode.NodeType != XmlNodeType.Element) continue;
+
                                 TraverseArray(cnode, pb, arrEntry, subarrEntry, results, data, structInfo);
 
                                 arrEntry.DataOffset += 16;//ptr size... todo: what if not pointer array?
@@ -819,6 +822,8 @@ private static byte[][] TraverseArrayStructureRaw(XmlNode node, PsoBuilder pb, M
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
+
                 var struc = Traverse(cnode, pb, type);
 
                 if (struc != null)
@@ -842,6 +847,8 @@ private static PsoPOINTER[] TraverseArrayStructurePointerRaw(XmlNode node, PsoBu
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
+
                 var type = (MetaName)(uint)GetHash(cnode.Attributes["type"]?.Value ?? "");
                 if (type != 0)
                 {
@@ -1067,6 +1074,7 @@ private static MetaHash[] TraverseHashArrayRaw(XmlNode node)
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
                 var val = GetHash(cnode.InnerText);
                 items.Add(MetaTypes.SwapBytes(val));
             }
@@ -1079,6 +1087,7 @@ private static string[] TraverseStringArrayRaw(XmlNode node)
 
             foreach (XmlNode cnode in node.ChildNodes)
             {
+                if (cnode.NodeType != XmlNodeType.Element) continue;
                 items.Add(cnode.InnerText);
             }
 
@@ -1141,6 +1150,7 @@ private static XmlNode GetEntryNode(XmlNodeList nodes, MetaName name)
         {
             foreach (XmlNode node in nodes)
             {
+                if (node.NodeType != XmlNodeType.Element) continue;
                 if (GetHash(node.Name) == (uint)name)
                 {
                     return node;

CodeWalker.Core/GameFiles/MetaTypes/XmlRbf.cs

@@ -69,7 +69,13 @@ private static IRbfType Traverse(XNode node)
 
                 var n = new RbfStructure();
                 n.Name = element.Name.LocalName;
-                n.Children = element.Nodes().Select(c => Traverse(c)).ToList();
+                n.Children = new List<IRbfType>();
+                foreach (var c in element.Nodes())
+                {
+                    var child = Traverse(c);
+                    if (child == null) continue;
+                    n.Children.Add(child);
+                }
 
                 foreach (var attr in element.Attributes())
                 {

CodeWalker.Core/GameFiles/Resources/Bounds.cs

@@ -1235,6 +1235,7 @@ public override void ReadXml(XmlNode node)
                     var polylist = new List<BoundPolygon>();
                     foreach (XmlNode inode in inodes)
                     {
+                        if (inode.NodeType != XmlNodeType.Element) continue;
                         var typestr = inode.Name;
                         var type = Xml.GetEnumValue<BoundPolygonType>(typestr);
                         var poly = CreatePolygon(type);

CodeWalker.Core/World/Weather.cs

@@ -344,6 +344,7 @@ public void Init(GameFileCache gameFileCache, XmlNode node)
 
                 foreach (XmlNode cycle in tcxml.DocumentElement.ChildNodes)
                 {
+                    if (cycle.NodeType != XmlNodeType.Element) continue;
                     TimeCycleData = new WeatherCycleKeyframeData();
                     TimeCycleData.Init(cycle);
                 }
@@ -402,6 +403,7 @@ public void Init(XmlNode node)
             Regions = new Dictionary<string, WeatherCycleKeyframeRegion>();
             foreach (XmlNode child in node.ChildNodes)
             {
+                if (child.NodeType != XmlNodeType.Element) continue;
                 WeatherCycleKeyframeRegion r = new WeatherCycleKeyframeRegion();
                 r.Init(child);
                 Regions[r.Name] = r;
@@ -425,6 +427,7 @@ public void Init(XmlNode node)
             Data = new Dictionary<string, WeatherCycleKeyframeDataEntry>();
             foreach (XmlNode child in node.ChildNodes)
             {
+                if (child.NodeType != XmlNodeType.Element) continue;
                 if (child != null)
                 {
                     WeatherCycleKeyframeDataEntry d = new WeatherCycleKeyframeDataEntry();