Fixed handling of asset references for saving.

master131 · Jan 25, 2019 · 78db3c7 · 78db3c7
1 parent 11f7ef9
commit 78db3c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Format/SndAliasBank.cs b/Format/SndAliasBank.cs
@@ -15,7 +15,6 @@ class SndAliasBank : IDisposable
         public int SizeOfDependencyEntry { get; set; }
         public List<SndAssetBankEntry> Entries { get; set; }
         public List<byte[]> Checksums { get; set; }
-        public long Unknown { get; set; }
         public long Length { get; set; }
         public long OffsetOfEntries { get; set; }
         public long OffsetOfChecksums { get; set; }

diff --git a/Format/SndAliasBankWriter.cs b/Format/SndAliasBankWriter.cs
@@ -23,17 +23,22 @@ public void Write(Stream stream, bool autoCalculate, bool fixHashes = false)
                     entry.Data.Cache();
             }
 
+            // Calculate asset reference count
+            var assetReferenceCount = 0L;
+            for (assetReferenceCount = 0; assetReferenceCount < _sndAliasBank.AssetReferences.Length; assetReferenceCount++)
+                if (_sndAliasBank.AssetReferences[assetReferenceCount] == null)
+                    break;
+
             // Write the header.
             stream.SetLength(0);
-
             var writer = new BinaryWriter(stream);
             writer.Write(_sndAliasBank.Magic);
             writer.Write(_sndAliasBank.Version);
             writer.Write(_sndAliasBank.SizeOfAudioEntry);
             writer.Write(_sndAliasBank.SizeOfChecksumEntry);
             writer.Write(_sndAliasBank.SizeOfDependencyEntry);
             writer.Write(_sndAliasBank.Entries.Count);
-            writer.Write(_sndAliasBank.Unknown);
+            writer.Write(assetReferenceCount);
             var lengthAndOffsetsPosition = stream.Position;
             writer.Write(_sndAliasBank.Length);
             writer.Write(_sndAliasBank.OffsetOfEntries);
@@ -43,7 +48,7 @@ public void Write(Stream stream, bool autoCalculate, bool fixHashes = false)
             // Write the asset references.
             for (int i = 0; i < _sndAliasBank.AssetReferences.Length; i++)
             {
-                var value = _sndAliasBank.AssetReferences[i];
+                var value = _sndAliasBank.AssetReferences[i] ?? string.Empty;
 
                 // Truncate the reference name if required.
                 if (value.Length > _sndAliasBank.SizeOfDependencyEntry)