Fix small bug that breaks repacked resources

Seems to repack the resources properly now, haven't tested with mods yet though but hopefully they'll work the same as they did in the betas (might require "devMode_enable 1" launch parameter though)
emoose · Feb 7, 2017 · 1ed310c · 1ed310c
1 parent 9a6ef4c
commit 1ed310c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/DOOMExtract/Program.cs b/DOOMExtract/Program.cs
@@ -29,7 +29,7 @@ static void PrintUsage()
         }
         static void Main(string[] args)
         {
-            Console.WriteLine("DOOMExtract 1.5 - by infogram");
+            Console.WriteLine("DOOMExtract 1.5.1 - by infogram");
             Console.WriteLine();
             if (args.Length <= 0)
             {

diff --git a/DOOMExtract/Properties/AssemblyInfo.cs b/DOOMExtract/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
diff --git a/DOOMExtract/ResourceIndex.cs b/DOOMExtract/ResourceIndex.cs
@@ -22,7 +22,7 @@ public class DOOMResourceEntry
         public int Size;
         public int CompressedSize;
         public long Zero;
-        public byte Zero1;
+        public byte PatchFileIndex;
 
         public DOOMResourceEntry(DOOMResourceIndex index)
         {
@@ -71,7 +71,7 @@ public void Read(EndianIO io)
             else
                 Zero = io.Reader.ReadInt32(); // Zero field is 4 bytes instead of 8 in version 5+
 
-            Zero1 = io.Reader.ReadByte();
+            PatchFileIndex = io.Reader.ReadByte();
         }
 
         public void Write(EndianIO io)
@@ -96,7 +96,7 @@ public void Write(EndianIO io)
                 io.Writer.Write(Zero);
             else
                 io.Writer.Write((int)Zero); // Zero field is 4 bytes instead of 8 in version 5+
-            io.Writer.Write(Zero1);
+            io.Writer.Write(PatchFileIndex);
         }
     }
     public class DOOMResourceIndex
@@ -142,10 +142,14 @@ public long CopyEntryDataToStream(DOOMResourceEntry entry, Stream destStream, bo
             resourceIO.Stream.Position = entry.Offset;
 
             Stream sourceStream = resourceIO.Stream;
+            long copyLen = entry.CompressedSize;
             if (entry.Size != entry.CompressedSize && decompress)
+            {
                 sourceStream = new InflaterInputStream(resourceIO.Stream, new ICSharpCode.SharpZipLib.Zip.Compression.Inflater(true), 4096);
+                copyLen = entry.Size;
+            }
 
-            return StreamCopy(destStream, sourceStream, 40960, entry.Size);
+            return StreamCopy(destStream, sourceStream, 40960, copyLen);
         }
 
         /*public static byte[] CompressData(byte[] data, ZLibNet.CompressionLevel level = ZLibNet.CompressionLevel.Level9)
@@ -258,8 +262,6 @@ public void Rebuild(string destResourceFile, string replaceFromFolder = "", bool
                     continue;
                 }
 
-                bool isCompressed = keepCompressed;
-
                 var replacePath = (String.IsNullOrEmpty(replaceFromFolder) ? String.Empty : Path.Combine(replaceFromFolder, file.GetFullName()));
                 if (File.Exists(replacePath + ";" + file.FileType))
                     replacePath += ";" + file.FileType;
@@ -274,7 +276,7 @@ public void Rebuild(string destResourceFile, string replaceFromFolder = "", bool
                         file.CompressedSize = file.Size = (int)StreamCopy(destResources.Stream, fs, 40960, fs.Length);
                 }
                 else
-                    file.CompressedSize = file.Size = (int)CopyEntryDataToStream(file, destResources.Stream, !keepCompressed);
+                    file.CompressedSize = (int)CopyEntryDataToStream(file, destResources.Stream, !keepCompressed);
             }
 
             // now add any files that weren't replaced