Fix BG3 multipart archive behavior

Norbyte · Oct 13, 2020 · 3ceaf72 · 3ceaf72
1 parent 5d68a96
commit 3ceaf72
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,4 @@ DebuggerFrontend/Osidebug.cs
 StoryCompiler/Debuginfo.cs
 DebuggerFrontend/Debuginfo.cs
 DebuggerFrontend/DbgProtocol.cs
+WwiseTool
diff --git a/ConverterApp/MainForm.Designer.cs b/ConverterApp/MainForm.Designer.cs
diff --git a/ConverterApp/PackagePane.Designer.cs b/ConverterApp/PackagePane.Designer.cs
diff --git a/ConverterApp/PackagePane.cs b/ConverterApp/PackagePane.cs
@@ -93,6 +93,19 @@ private void extractPackageBtn_Click(object sender, EventArgs e)
             }
         }
 
+        private PackageVersion SelectedPackageVersion()
+        {
+            switch (packageVersion.SelectedIndex)
+            {
+                case 0: return PackageVersion.V15;
+                case 1: return PackageVersion.V13;
+                case 2: return PackageVersion.V10;
+                case 3: return PackageVersion.V9;
+                case 4: return PackageVersion.V7;
+                default: throw new InvalidDataException();
+            }
+        }
+
         private void createPackageBtn_Click(object sender, EventArgs e)
         {
             createPackageBtn.Enabled = false;
@@ -101,34 +114,7 @@ private void createPackageBtn_Click(object sender, EventArgs e)
             try
             {
                 var options = new PackageCreationOptions();
-                switch (packageVersion.SelectedIndex)
-                {
-                    case 0:
-                    {
-                        options.Version = PackageVersion.V15;
-                        break;
-                    }
-                    case 1:
-                    {
-                        options.Version = PackageVersion.V13;
-                        break;
-                    }
-                    case 2:
-                    {
-                        options.Version = PackageVersion.V10;
-                        break;
-                    }
-                    case 3:
-                    {
-                        options.Version = PackageVersion.V9;
-                        break;
-                    }
-                    case 4:
-                    {
-                        options.Version = PackageVersion.V7;
-                        break;
-                    }
-                }
+                options.Version = SelectedPackageVersion();
 
                 switch (compressionMethod.SelectedIndex)
                 {
@@ -272,5 +258,12 @@ public void SetGame(Game game)
                     break;
             }
         }
+
+        private void packageVersion_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            var hasPackageFlags = SelectedPackageVersion() < PackageVersion.V15;
+            packagePriority.Enabled = hasPackageFlags;
+            solid.Enabled = hasPackageFlags;
+        }
     }
 }
diff --git a/LSLib/LS/PackageWriter.cs b/LSLib/LS/PackageWriter.cs
@@ -47,7 +47,7 @@ public PackagedFileInfo WriteFile(AbstractFileInfo info)
         {
             // Assume that all files are written uncompressed (worst-case) when calculating package sizes
             long size = (long)info.Size();
-            if (_streams.Last().Position + size > MaxPackageSize)
+            if (Version < PackageVersion.V15 && _streams.Last().Position + size > MaxPackageSize)
             {
                 // Start a new package file if the current one is full.
                 string partPath = Package.MakePartFilename(_path, _streams.Count);