ESPReaders and ESPWriters now carry a reference to which master they are reading for

CGarrison89 · CGarrison89 · commit 485c2e503fa7 · 2015-06-12T09:33:04.000-06:00
diff --git a/ESPSharp/ESPReader.cs b/ESPSharp/ESPReader.cs
@@ -11,8 +11,12 @@ namespace ESPSharp
 {
     public class ESPReader : BinaryReader
     {
-        public ESPReader(Stream stream)
-            : base(stream, Utility.WesternEncoding) { }
+        public ElderScrollsPlugin Master { get; set; }
+        public ESPReader(Stream stream, ElderScrollsPlugin master)
+            : base(stream, Utility.WesternEncoding) 
+        {
+            Master = master;
+        }
 
         public string ReadTag()
         {
diff --git a/ESPSharp/ESPWriter.cs b/ESPSharp/ESPWriter.cs
@@ -10,8 +10,12 @@ namespace ESPSharp
 {
     public class ESPWriter : BinaryWriter
     {
-        public ESPWriter(Stream stream)
-            :base(stream, Utility.WesternEncoding){}
+        public ElderScrollsPlugin Master { get; set; }
+        public ESPWriter(Stream stream, ElderScrollsPlugin master)
+            :base(stream, Utility.WesternEncoding)
+        {
+            Master = master;
+        }
 
         public void WriteTag(string Tag)
         {
diff --git a/ESPSharp/ElderScrollsPlugin.cs b/ESPSharp/ElderScrollsPlugin.cs
@@ -128,7 +128,7 @@ public void ReadBinary(string file)
             mmf = MemoryMappedFile.CreateFromFile(file, FileMode.Open, Path.GetFileNameWithoutExtension(file), fi.Length, MemoryMappedFileAccess.Read);
 
             using (MemoryMappedViewStream stream = mmf.CreateViewStream(0, fi.Length, MemoryMappedFileAccess.Read))
-            using (ESPReader reader = new ESPReader(stream))
+            using (ESPReader reader = new ESPReader(stream, this))
             {
                 Header = new RecordView(reader, mmf);
 
diff --git a/ESPSharp/Record.cs b/ESPSharp/Record.cs
@@ -109,7 +109,7 @@ public void WriteBinary(ESPWriter writer)
                 else
                 {
                     using (MemoryStream stream = new MemoryStream())
-                    using (ESPWriter subWriter = new ESPWriter(stream))
+                    using (ESPWriter subWriter = new ESPWriter(stream, writer.Master))
                     {
                         WriteData(subWriter);
                         stream.Position = 0;
@@ -147,7 +147,7 @@ public void ReadBinary(ESPReader reader)
                     corruptedBytes = outBytes;
                 else
                     using (MemoryStream stream = new MemoryStream(outBytes))
-                    using (ESPReader subReader = new ESPReader(stream))
+                    using (ESPReader subReader = new ESPReader(stream, reader.Master))
                         ReadData(subReader, stream.Length);
             }
             else
diff --git a/ESPSharp/RecordView.cs b/ESPSharp/RecordView.cs
@@ -52,7 +52,7 @@ public Record Record
                     case DataSource.Binary:
 
                         using (MemoryMappedViewStream stream = file.CreateViewStream(Offset, Size, MemoryMappedFileAccess.Read))
-                        using (ESPReader reader = new ESPReader(stream))
+                        using (ESPReader reader = new ESPReader(stream, master))
                         {
                             outRecord = Record.CreateRecord(reader);
                             outRecord.ReadBinary(reader);
diff --git a/ESPSharp/Subrecords/GeneratedCode/AnimationSound.cs b/ESPSharp/Subrecords/GeneratedCode/AnimationSound.cs
@@ -48,7 +48,7 @@ public AnimationSound(AnimationSound copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/ArmorData.cs b/ESPSharp/Subrecords/GeneratedCode/ArmorData.cs
@@ -44,7 +44,7 @@ public ArmorData(ArmorData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/ArmorExtraData.cs b/ESPSharp/Subrecords/GeneratedCode/ArmorExtraData.cs
@@ -48,7 +48,7 @@ public ArmorExtraData(ArmorExtraData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/Attributes.cs b/ESPSharp/Subrecords/GeneratedCode/Attributes.cs
@@ -60,7 +60,7 @@ public Attributes(Attributes copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/BipedData.cs b/ESPSharp/Subrecords/GeneratedCode/BipedData.cs
@@ -44,7 +44,7 @@ public BipedData(BipedData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/BookData.cs b/ESPSharp/Subrecords/GeneratedCode/BookData.cs
@@ -48,7 +48,7 @@ public BookData(BookData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/ClassData.cs b/ESPSharp/Subrecords/GeneratedCode/ClassData.cs
@@ -68,7 +68,7 @@ public ClassData(ClassData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/Condition.cs b/ESPSharp/Subrecords/GeneratedCode/Condition.cs
@@ -48,7 +48,7 @@ public Condition(Condition copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/DecalData.cs b/ESPSharp/Subrecords/GeneratedCode/DecalData.cs
@@ -76,7 +76,7 @@ public DecalData(DecalData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/DestructableHeader.cs b/ESPSharp/Subrecords/GeneratedCode/DestructableHeader.cs
@@ -48,7 +48,7 @@ public DestructableHeader(DestructableHeader copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/DestructionStageData.cs b/ESPSharp/Subrecords/GeneratedCode/DestructionStageData.cs
@@ -64,7 +64,7 @@ public DestructionStageData(DestructionStageData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/EffectData.cs b/ESPSharp/Subrecords/GeneratedCode/EffectData.cs
@@ -52,7 +52,7 @@ public EffectData(EffectData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/EnchantData.cs b/ESPSharp/Subrecords/GeneratedCode/EnchantData.cs
@@ -52,7 +52,7 @@ public EnchantData(EnchantData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/FactionData.cs b/ESPSharp/Subrecords/GeneratedCode/FactionData.cs
@@ -44,7 +44,7 @@ public FactionData(FactionData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/HavokData.cs b/ESPSharp/Subrecords/GeneratedCode/HavokData.cs
@@ -44,7 +44,7 @@ public HavokData(HavokData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/LocalVariableData.cs b/ESPSharp/Subrecords/GeneratedCode/LocalVariableData.cs
@@ -48,7 +48,7 @@ public LocalVariableData(LocalVariableData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/MagicEffectData.cs b/ESPSharp/Subrecords/GeneratedCode/MagicEffectData.cs
@@ -108,7 +108,7 @@ public MagicEffectData(MagicEffectData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/ObjectBounds.cs b/ESPSharp/Subrecords/GeneratedCode/ObjectBounds.cs
@@ -56,7 +56,7 @@ public ObjectBounds(ObjectBounds copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/PluginHeader.cs b/ESPSharp/Subrecords/GeneratedCode/PluginHeader.cs
@@ -44,7 +44,7 @@ public PluginHeader(PluginHeader copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/RaceData.cs b/ESPSharp/Subrecords/GeneratedCode/RaceData.cs
@@ -112,7 +112,7 @@ public RaceData(RaceData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/RaceDefaultHairColors.cs b/ESPSharp/Subrecords/GeneratedCode/RaceDefaultHairColors.cs
@@ -40,7 +40,7 @@ public RaceDefaultHairColors(RaceDefaultHairColors copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/RaceDefaultHairStyles.cs b/ESPSharp/Subrecords/GeneratedCode/RaceDefaultHairStyles.cs
@@ -40,7 +40,7 @@ public RaceDefaultHairStyles(RaceDefaultHairStyles copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/RaceDefaultVoices.cs b/ESPSharp/Subrecords/GeneratedCode/RaceDefaultVoices.cs
@@ -40,7 +40,7 @@ public RaceDefaultVoices(RaceDefaultVoices copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/RecordReference.cs b/ESPSharp/Subrecords/GeneratedCode/RecordReference.cs
@@ -36,7 +36,7 @@ public RecordReference(RecordReference copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/Relationship.cs b/ESPSharp/Subrecords/GeneratedCode/Relationship.cs
@@ -44,7 +44,7 @@ public Relationship(Relationship copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/ScriptData.cs b/ESPSharp/Subrecords/GeneratedCode/ScriptData.cs
@@ -56,7 +56,7 @@ public ScriptData(ScriptData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/SoundAttenuation.cs b/ESPSharp/Subrecords/GeneratedCode/SoundAttenuation.cs
@@ -52,7 +52,7 @@ public SoundAttenuation(SoundAttenuation copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/SoundData.cs b/ESPSharp/Subrecords/GeneratedCode/SoundData.cs
@@ -96,7 +96,7 @@ public SoundData(SoundData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/SoundDataShort.cs b/ESPSharp/Subrecords/GeneratedCode/SoundDataShort.cs
@@ -64,7 +64,7 @@ public SoundDataShort(SoundDataShort copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/SpellData.cs b/ESPSharp/Subrecords/GeneratedCode/SpellData.cs
@@ -52,7 +52,7 @@ public SpellData(SpellData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/SubrecordTemplate.t4 b/ESPSharp/Subrecords/GeneratedCode/SubrecordTemplate.t4
@@ -86,7 +86,7 @@ namespace ESPSharp.Subrecords
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharp/Subrecords/GeneratedCode/TerminalData.cs b/ESPSharp/Subrecords/GeneratedCode/TerminalData.cs
@@ -48,7 +48,7 @@ public TerminalData(TerminalData copyObject)
 		protected override void ReadData(ESPReader reader)
 		{
 			using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))
-			using (ESPReader subReader = new ESPReader(stream))
+			using (ESPReader subReader = new ESPReader(stream, reader.Master))
 			{
 				try
 				{
diff --git a/ESPSharpTest/Program.cs b/ESPSharpTest/Program.cs
@@ -44,7 +44,7 @@ static void Main(string[] args)
         Console.WriteLine("Writing binary...");
 
         using (FileStream stream = new FileStream("NEW" + testFile, FileMode.Create, FileAccess.ReadWrite))
-        using (ESPWriter writer = new ESPWriter(stream))
+        using (ESPWriter writer = new ESPWriter(stream, pluggy))
         {
             pluggy.WriteBinary(writer);
         }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,12 @@ namespace ESPSharp`
`11`	`11`	`{`
`12`	`12`	`public class ESPReader : BinaryReader`
`13`	`13`	`{`
`14`		`- public ESPReader(Stream stream)`
`15`		`- : base(stream, Utility.WesternEncoding) { }`
	`14`	`+ public ElderScrollsPlugin Master { get; set; }`
	`15`	`+ public ESPReader(Stream stream, ElderScrollsPlugin master)`
	`16`	`+ : base(stream, Utility.WesternEncoding)`
	`17`	`+ {`
	`18`	`+ Master = master;`
	`19`	`+ }`
`16`	`20`
`17`	`21`	`public string ReadTag()`
`18`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,12 @@ namespace ESPSharp`
`10`	`10`	`{`
`11`	`11`	`public class ESPWriter : BinaryWriter`
`12`	`12`	`{`
`13`		`- public ESPWriter(Stream stream)`
`14`		`- :base(stream, Utility.WesternEncoding){}`
	`13`	`+ public ElderScrollsPlugin Master { get; set; }`
	`14`	`+ public ESPWriter(Stream stream, ElderScrollsPlugin master)`
	`15`	`+ :base(stream, Utility.WesternEncoding)`
	`16`	`+ {`
	`17`	`+ Master = master;`
	`18`	`+ }`
`15`	`19`
`16`	`20`	`public void WriteTag(string Tag)`
`17`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public void ReadBinary(string file)`
`128`	`128`	`mmf = MemoryMappedFile.CreateFromFile(file, FileMode.Open, Path.GetFileNameWithoutExtension(file), fi.Length, MemoryMappedFileAccess.Read);`
`129`	`129`
`130`	`130`	`using (MemoryMappedViewStream stream = mmf.CreateViewStream(0, fi.Length, MemoryMappedFileAccess.Read))`
`131`		`- using (ESPReader reader = new ESPReader(stream))`
	`131`	`+ using (ESPReader reader = new ESPReader(stream, this))`
`132`	`132`	`{`
`133`	`133`	`Header = new RecordView(reader, mmf);`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void WriteBinary(ESPWriter writer)`
`109`	`109`	`else`
`110`	`110`	`{`
`111`	`111`	`using (MemoryStream stream = new MemoryStream())`
`112`		`- using (ESPWriter subWriter = new ESPWriter(stream))`
	`112`	`+ using (ESPWriter subWriter = new ESPWriter(stream, writer.Master))`
`113`	`113`	`{`
`114`	`114`	`WriteData(subWriter);`
`115`	`115`	`stream.Position = 0;`
`@@ -147,7 +147,7 @@ public void ReadBinary(ESPReader reader)`
`147`	`147`	`corruptedBytes = outBytes;`
`148`	`148`	`else`
`149`	`149`	`using (MemoryStream stream = new MemoryStream(outBytes))`
`150`		`- using (ESPReader subReader = new ESPReader(stream))`
	`150`	`+ using (ESPReader subReader = new ESPReader(stream, reader.Master))`
`151`	`151`	`ReadData(subReader, stream.Length);`
`152`	`152`	`}`
`153`	`153`	`else`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public Record Record`
`52`	`52`	`case DataSource.Binary:`
`53`	`53`
`54`	`54`	`using (MemoryMappedViewStream stream = file.CreateViewStream(Offset, Size, MemoryMappedFileAccess.Read))`
`55`		`- using (ESPReader reader = new ESPReader(stream))`
	`55`	`+ using (ESPReader reader = new ESPReader(stream, master))`
`56`	`56`	`{`
`57`	`57`	`outRecord = Record.CreateRecord(reader);`
`58`	`58`	`outRecord.ReadBinary(reader);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public AnimationSound(AnimationSound copyObject)`
`48`	`48`	`protected override void ReadData(ESPReader reader)`
`49`	`49`	`{`
`50`	`50`	`using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))`
`51`		`- using (ESPReader subReader = new ESPReader(stream))`
	`51`	`+ using (ESPReader subReader = new ESPReader(stream, reader.Master))`
`52`	`52`	`{`
`53`	`53`	`try`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ArmorData(ArmorData copyObject)`
`44`	`44`	`protected override void ReadData(ESPReader reader)`
`45`	`45`	`{`
`46`	`46`	`using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))`
`47`		`- using (ESPReader subReader = new ESPReader(stream))`
	`47`	`+ using (ESPReader subReader = new ESPReader(stream, reader.Master))`
`48`	`48`	`{`
`49`	`49`	`try`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public ArmorExtraData(ArmorExtraData copyObject)`
`48`	`48`	`protected override void ReadData(ESPReader reader)`
`49`	`49`	`{`
`50`	`50`	`using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))`
`51`		`- using (ESPReader subReader = new ESPReader(stream))`
	`51`	`+ using (ESPReader subReader = new ESPReader(stream, reader.Master))`
`52`	`52`	`{`
`53`	`53`	`try`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public Attributes(Attributes copyObject)`
`60`	`60`	`protected override void ReadData(ESPReader reader)`
`61`	`61`	`{`
`62`	`62`	`using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))`
`63`		`- using (ESPReader subReader = new ESPReader(stream))`
	`63`	`+ using (ESPReader subReader = new ESPReader(stream, reader.Master))`
`64`	`64`	`{`
`65`	`65`	`try`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public BipedData(BipedData copyObject)`
`44`	`44`	`protected override void ReadData(ESPReader reader)`
`45`	`45`	`{`
`46`	`46`	`using (MemoryStream stream = new MemoryStream(reader.ReadBytes(size)))`
`47`		`- using (ESPReader subReader = new ESPReader(stream))`
	`47`	`+ using (ESPReader subReader = new ESPReader(stream, reader.Master))`
`48`	`48`	`{`
`49`	`49`	`try`
`50`	`50`	`{`