Merge remote-tracking branch 'upstream/master'

ModernWoWTools · Jul 15, 2024 · e45058f · e45058f
2 parents 33e8d45 + fecbd5d
commit e45058f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/Warcraft.NET/Attribute/ChunkAttributes.cs b/Warcraft.NET/Attribute/ChunkAttributes.cs
@@ -7,7 +7,7 @@ namespace Warcraft.NET.Attribute
     public sealed class ChunkOrderAttribute : System.Attribute
     {
         private readonly int order_;
-        public ChunkOrderAttribute([CallerLineNumber]int order = 0)
+        public ChunkOrderAttribute([CallerLineNumber] int order = 0)
         {
             order_ = order;
         }
@@ -27,16 +27,21 @@ public ChunkOptionalAttribute(bool optional = true)
         public bool Optional { get { return optional_; } }
     }
 
-
     [AttributeUsage(AttributeTargets.Property, Inherited = false, AllowMultiple = false)]
     public sealed class ChunkArrayAttribute : System.Attribute
     {
         private readonly int length;
-        public ChunkArrayAttribute([CallerLineNumber]int length = 0)
+        public ChunkArrayAttribute([CallerLineNumber] int length = 0)
         {
             this.length = length;
         }
 
         public int Length { get { return length; } }
     }
+
+    [AttributeUsage(AttributeTargets.Property, Inherited = false, AllowMultiple = false)]
+    public sealed class ChunkIgnoreAttribute : System.Attribute
+    {
+        public ChunkIgnoreAttribute() { }
+    }
 }
diff --git a/Warcraft.NET/Files/ChunkedFile.cs b/Warcraft.NET/Files/ChunkedFile.cs
@@ -1,11 +1,11 @@
-using Warcraft.NET.Attribute;
-using Warcraft.NET.Exceptions;
-using Warcraft.NET.Extensions;
-using Warcraft.NET.Files.Interfaces;
+using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System;
+using Warcraft.NET.Attribute;
+using Warcraft.NET.Exceptions;
+using Warcraft.NET.Extensions;
+using Warcraft.NET.Files.Interfaces;
 
 namespace Warcraft.NET.Files
 {
@@ -40,11 +40,12 @@ public void LoadBinaryData(byte[] inData)
             using (var ms = new MemoryStream(inData))
             using (var br = new BinaryReader(ms))
             {
-                var terrainChunkProperties = GetType()
+                var chunkProperties = GetType()
                     .GetProperties()
+                    .Where(p => (ChunkIgnoreAttribute)p.GetCustomAttribute(typeof(ChunkIgnoreAttribute), false) == null)
                     .OrderBy(p => ((ChunkOrderAttribute)p.GetCustomAttributes(typeof(ChunkOrderAttribute), false).Single()).Order);
 
-                foreach (PropertyInfo chunkProperty in terrainChunkProperties)
+                foreach (PropertyInfo chunkProperty in chunkProperties)
                 {
                     try
                     {
@@ -113,6 +114,7 @@ public byte[] Serialize(long offset = 0)
             {
                 var terrainChunkProperties = GetType()
                     .GetProperties()
+                    .Where(p => (ChunkIgnoreAttribute)p.GetCustomAttribute(typeof(ChunkIgnoreAttribute), false) == null)
                     .OrderBy(p => ((ChunkOrderAttribute)p.GetCustomAttributes(typeof(ChunkOrderAttribute), false).Single()).Order);
 
                 foreach (PropertyInfo chunkPropertie in terrainChunkProperties)
@@ -156,7 +158,7 @@ public byte[] Serialize(long offset = 0)
                 return ms.ToArray();
             }
         }
-    
+
         public virtual bool IsReverseSignature()
         {
             return true;

diff --git a/Warcraft.NET/Files/WDT/Light/Legion/WorldLightTable.cs b/Warcraft.NET/Files/WDT/Light/Legion/WorldLightTable.cs
@@ -1,4 +1,5 @@
-using Warcraft.NET.Attribute;
+using System;
+using Warcraft.NET.Attribute;
 using Warcraft.NET.Files.WDT.Chunks.Legion;
 using WorldLightTableWoD = Warcraft.NET.Files.WDT.Light.WoD.WorldLightTable;
 
@@ -12,6 +13,12 @@ public class WorldLightTable : WorldLightTableWoD
         [ChunkOrder(2), ChunkOptional]
         public MPL2 PointLights2 { get; set; }
 
+        /// <summary>
+        /// (Obsolete) Legion Point Light Table
+        /// </summary>
+        [ChunkIgnore, Obsolete("Use PointLights2 instead.")]
+        public MPL2 LightTable2 { get { return PointLights2; } set { PointLights2 = value; } }
+
         /// <summary>
         /// Texture FileDataIDs
         /// </summary>