correctly handle offsetting pak2 formats

Author: MattFiler

CathodeLib/Scripts/CATHODE/PAK2.cs

@@ -29,7 +29,7 @@ override protected bool LoadInternal()
                 if (MagicValidation != "PAK2") { reader.Close(); return false; }
                 int offsetListBegin = reader.ReadInt32() + 16;
                 int entryCount = reader.ReadInt32();
-                reader.BaseStream.Position += 4; //Skip "4"
+                int alignment = reader.ReadInt32();
 
                 //Read all file names and create entries
                 for (int i = 0; i < entryCount; i++)
@@ -47,7 +47,10 @@ override protected bool LoadInternal()
 
                 //Read in the files to entries
                 for (int i = 0; i < entryCount; i++)
-                    Entries[i].Content = Utilities.RemoveLeadingNulls(reader.ReadBytes(FileOffsets[i + 1] - FileOffsets[i]));
+                {
+                    Utilities.Align(reader, alignment);
+                    Entries[i].Content = reader.ReadBytes(FileOffsets[i + 1] - (int)reader.BaseStream.Position);
+                }
             }
             return true;
         }
@@ -58,14 +61,12 @@ override protected bool SaveInternal()
             {
                 writer.BaseStream.SetLength(0);
                 Utilities.WriteString("PAK2", writer);
-                int OffsetListBegin_New = 0;
-                for (int i = 0; i < Entries.Count; i++) OffsetListBegin_New += Entries[i].Filename.Length + 1;
-                writer.Write(OffsetListBegin_New);
+                writer.Write(0);
                 writer.Write(Entries.Count);
                 writer.Write(4);
 
                 //Write filenames
-                for (int i = 0; i < Entries.Count; i++) Utilities.WriteString(Entries[i].Filename.Replace("\\", "/"), writer, true);
+                for (int i = 0; i < Entries.Count; i++) Utilities.WriteString(Entries[i].Filename, writer, true);
 
                 //Write placeholder offsets for now, we'll correct them after writing the content
                 int offsetListBegin = (int)writer.BaseStream.Position;
@@ -75,12 +76,15 @@ override protected bool SaveInternal()
                 List<int> offsets = new List<int>();
                 for (int i = 0; i < Entries.Count; i++)
                 {
-                    while (writer.BaseStream.Position % 4 != 0) writer.Write((byte)0x00);
+                    Utilities.Align(writer, 4);
                     writer.Write(Entries[i].Content);
                     offsets.Add((int)writer.BaseStream.Position);
                 }
+                Utilities.Align(writer, 4);
 
                 //Re-write offsets with correct values
+                writer.BaseStream.Position = 4;
+                writer.Write(offsetListBegin - 16);
                 writer.BaseStream.Position = offsetListBegin;
                 for (int i = 0; i < Entries.Count; i++) writer.Write(offsets[i]);
             }

CathodeLib/Scripts/Utilities.cs

@@ -43,8 +43,8 @@ public static T[] ConsumeArray<T>(byte[] bytes, int count)
 
         //Align the stream
         public static void Align(BinaryReader reader, int val = 4)
-        {
-            while (reader.BaseStream.Position % val != 0) reader.ReadByte();
+        {
+            reader.BaseStream.Seek((val - (reader.BaseStream.Position % val)) % val, SeekOrigin.Current);
         }
         public static void Align(BinaryWriter writer, int val = 4, byte fillWith = 0x00)
         {