Fix padding math error + some minor pindex differences

emoose · Feb 8, 2017 · 8b192e2 · 8b192e2
1 parent 5db97ca
commit 8b192e2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/DOOMExtract/DOOMResourceIndex.cs b/DOOMExtract/DOOMResourceIndex.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 
 namespace DOOMExtract
 {
@@ -150,8 +148,8 @@ private void addFilesFromFolder(string folder, string baseFolder, EndianIO destR
 
                 if (needToPad)
                 {
-                    int extra = 0x10 - ((int)destResources.Stream.Length % 0x10);
-                    destResources.Stream.SetLength(destResources.Stream.Length + extra);
+                    long numPadding = 0x10 - (destResources.Stream.Length % 0x10);
+                    destResources.Stream.SetLength(destResources.Stream.Length + numPadding);
                 }
 
                 fileEntry.Offset = destResources.Stream.Length;
@@ -208,18 +206,19 @@ public void Rebuild(string destResourceFile, string replaceFromFolder = "", bool
                 if (PatchFileNumber > 0 && destResources.Stream.Length == 4)
                     needToPad = false; // for some reason patch files start at 0x4 instead of 0x10
 
-                if (file.IsCompressed && PatchFileNumber > 0 && !isReplacing) // compressed files not padded in patch files?
+                if (file.IsCompressed && !isReplacing && PatchFileNumber > 0) // compressed files not padded in patch files?
                     needToPad = false;
 
                 if (needToPad)
                 {
-                    int extra = 0x10 - ((int)destResources.Stream.Length % 0x10);
-                    destResources.Stream.SetLength(destResources.Stream.Length + extra);
+                    long numPadding = 0x10 - (destResources.Stream.Length % 0x10);
+                    destResources.Stream.SetLength(destResources.Stream.Length + numPadding);
                 }
 
                 if (file.Size <= 0 && file.CompressedSize <= 0)
                 {
-                    file.Offset = (int)destResources.Stream.Length;
+                    // patch indexes have offsets for 0-byte files set to 0, but in normal indexes it's the current resource file length
+                    file.Offset = PatchFileNumber > 0 ? 0 : destResources.Stream.Length;
                     continue;
                 }
 

diff --git a/DOOMExtract/EndianIO.cs b/DOOMExtract/EndianIO.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.IO;
 
 namespace DOOMExtract

diff --git a/DOOMExtract/Program.cs b/DOOMExtract/Program.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.IO;
 
 namespace DOOMExtract
@@ -37,7 +35,7 @@ static void PrintUsage()
         }
         static void Main(string[] args)
         {
-            Console.WriteLine("DOOMExtract 1.6 - by infogram");
+            Console.WriteLine("DOOMExtract 1.6.1 by infogram - https://github.com/emoose/DOOMExtract");
             Console.WriteLine();
             if (args.Length <= 0)
             {
@@ -154,8 +152,13 @@ static void Main(string[] args)
 
                 index.Rebuild(resFile + "_tmp", destFolder, true);
                 index.Close();
+                if (!File.Exists(resFile + "_tmp"))
+                {
+                    Console.WriteLine("Failed to create new resource data file!");
+                    return;
+                }
 
-                if(File.Exists(resFile))
+                if (File.Exists(resFile))
                     File.Delete(resFile);
 
                 File.Move(resFile + "_tmp", resFile);

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.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/DOOMExtract/Utility.cs b/DOOMExtract/Utility.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 
 namespace DOOMExtract
 {