Update sound map reading

Resolves issues trying to read some custom levels.
LostArtefacts · Nov 22, 2024 · f1e093c · f1e093c
1 parent 5c8b43f
commit f1e093c
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 53 deletions.
diff --git a/TRLevelControl/Build/TRSFXBuilder.cs b/TRLevelControl/Build/TRSFXBuilder.cs
@@ -0,0 +1,35 @@
+using TRLevelControl.Model;
+
+namespace TRLevelControl.Build;
+
+public static class TRSFXBuilder
+{
+    public static List<short> ReadSoundMap(TRLevelReader reader)
+    {
+        List<short> map = new();
+        while (reader.PeekUInt() >= ushort.MaxValue)
+        {
+            map.Add(reader.ReadInt16());
+        }
+
+        return map;
+    }
+
+    public static TRDictionary<S, T> Build<S, T>(List<short> soundMap, List<T> soundDetails)
+        where S : Enum
+        where T : class
+    {
+        TRDictionary<S, T> result = new();
+        for (int i = 0; i < soundMap.Count; i++)
+        {
+            if (soundMap[i] == -1 || soundMap[i] >= soundDetails.Count)
+            {
+                continue;
+            }
+
+            result[(S)(object)(uint)i] = soundDetails[soundMap[i]];
+        }
+
+        return result;
+    }
+}
diff --git a/TRLevelControl/Control/TR1/TR1LevelControl.cs b/TRLevelControl/Control/TR1/TR1LevelControl.cs
@@ -302,8 +302,7 @@ private void WriteDemoData(TRLevelWriter writer)
 
     private void ReadSoundEffects(TRLevelReader reader)
     {
-        _level.SoundEffects = new();
-        short[] soundMap = reader.ReadInt16s(Enum.GetValues<TR1SFX>().Length);
+        List<short> soundMap = TRSFXBuilder.ReadSoundMap(reader);
 
         uint numSoundDetails = reader.ReadUInt32();
         List<TR1SoundEffect> sfx = new();
@@ -349,15 +348,7 @@ private void ReadSoundEffects(TRLevelReader reader)
             }
         }
 
-        for (int i = 0; i < soundMap.Length; i++)
-        {
-            if (soundMap[i] == -1)
-            {
-                continue;
-            }
-
-            _level.SoundEffects[(TR1SFX)i] = sfx[soundMap[i]];
-        }
+        _level.SoundEffects = TRSFXBuilder.Build<TR1SFX, TR1SoundEffect>(soundMap, sfx);
     }
 
     private void WriteSoundEffects(TRLevelWriter writer)

diff --git a/TRLevelControl/Control/TR2/TR2LevelControl.cs b/TRLevelControl/Control/TR2/TR2LevelControl.cs
@@ -308,8 +308,7 @@ private void WriteDemoData(TRLevelWriter writer)
 
     private void ReadSoundEffects(TRLevelReader reader)
     {
-        _level.SoundEffects = new();
-        short[] soundMap = reader.ReadInt16s(Enum.GetValues<TR2SFX>().Length);
+        List<short> soundMap = TRSFXBuilder.ReadSoundMap(reader);
 
         uint numSoundDetails = reader.ReadUInt32();
         List<TR2SoundEffect> sfx = new();
@@ -335,15 +334,7 @@ private void ReadSoundEffects(TRLevelReader reader)
             sfx[soundID].SampleID = sampleIndices[samplePointer];
         }
 
-        for (int i = 0; i < soundMap.Length; i++)
-        {
-            if (soundMap[i] < 0 || soundMap[i] >= sfx.Count)
-            {
-                continue;
-            }
-
-            _level.SoundEffects[(TR2SFX)i] = sfx[soundMap[i]];
-        }
+        _level.SoundEffects = TRSFXBuilder.Build<TR2SFX, TR2SoundEffect>(soundMap, sfx);
     }
 
     private void WriteSoundEffects(TRLevelWriter writer)

diff --git a/TRLevelControl/Control/TR3/TR3LevelControl.cs b/TRLevelControl/Control/TR3/TR3LevelControl.cs
@@ -308,8 +308,7 @@ private void WriteDemoData(TRLevelWriter writer)
 
     private void ReadSoundEffects(TRLevelReader reader)
     {
-        _level.SoundEffects = new();
-        short[] soundMap = reader.ReadInt16s(Enum.GetValues<TR3SFX>().Length);
+        List<short> soundMap = TRSFXBuilder.ReadSoundMap(reader);
 
         uint numSoundDetails = reader.ReadUInt32();
         List<TR3SoundEffect> sfx = new();
@@ -337,15 +336,7 @@ private void ReadSoundEffects(TRLevelReader reader)
             sfx[soundID].SampleID = sampleIndices[samplePointer];
         }
 
-        for (int i = 0; i < soundMap.Length; i++)
-        {
-            if (soundMap[i] < 0 || soundMap[i] >= sfx.Count)
-            {
-                continue;
-            }
-
-            _level.SoundEffects[(TR3SFX)i] = sfx[soundMap[i]];
-        }
+        _level.SoundEffects = TRSFXBuilder.Build<TR3SFX, TR3SoundEffect>(soundMap, sfx);
     }
 
     private void WriteSoundEffects(TRLevelWriter writer)

diff --git a/TRLevelControl/Control/TR4/TR4LevelControl.cs b/TRLevelControl/Control/TR4/TR4LevelControl.cs
@@ -328,8 +328,7 @@ private static void WriteDemoData(TRLevelWriter writer)
 
     private void ReadSoundEffects(TRLevelReader reader)
     {
-        _level.SoundEffects = new();
-        short[] soundMap = reader.ReadInt16s(Enum.GetValues<TR4SFX>().Length);
+        List<short> soundMap = TRSFXBuilder.ReadSoundMap(reader);
 
         uint numSoundDetails = reader.ReadUInt32();
         List<TR4SoundEffect> sfx = new();
@@ -356,15 +355,7 @@ private void ReadSoundEffects(TRLevelReader reader)
         uint[] sampleIndices = reader.ReadUInt32s(numSampleIndices);
         _observer?.OnSampleIndicesRead(sampleIndices);
 
-        for (int i = 0; i < soundMap.Length; i++)
-        {
-            if (soundMap[i] < 0 || soundMap[i] >= sfx.Count)
-            {
-                continue;
-            }
-
-            _level.SoundEffects[(TR4SFX)i] = sfx[soundMap[i]];
-        }
+        _level.SoundEffects = TRSFXBuilder.Build<TR4SFX, TR4SoundEffect>(soundMap, sfx);
     }
 
     private void WriteSoundEffects(TRLevelWriter writer)

diff --git a/TRLevelControl/Control/TR5/TR5LevelControl.cs b/TRLevelControl/Control/TR5/TR5LevelControl.cs
@@ -380,8 +380,7 @@ private static void WriteDemoData(TRLevelWriter writer)
 
     private void ReadSoundEffects(TRLevelReader reader)
     {
-        _level.SoundEffects = new();
-        short[] soundMap = reader.ReadInt16s(Enum.GetValues<TR5SFX>().Length);
+        List<short> soundMap = TRSFXBuilder.ReadSoundMap(reader);
 
         uint numSoundDetails = reader.ReadUInt32();
         List<TR4SoundEffect> sfx = new();
@@ -408,13 +407,7 @@ private void ReadSoundEffects(TRLevelReader reader)
         uint[] sampleIndices = reader.ReadUInt32s(numSampleIndices);
         _observer?.OnSampleIndicesRead(sampleIndices);
 
-        for (int i = 0; i < soundMap.Length; i++)
-        {
-            if (soundMap[i] == -1)
-                continue;
-
-            _level.SoundEffects[(TR5SFX)i] = sfx[soundMap[i]];
-        }
+        _level.SoundEffects = TRSFXBuilder.Build<TR5SFX, TR4SoundEffect>(soundMap, sfx);
 
         reader.ReadBytes(6); // OxCD padding
 

diff --git a/TRLevelControl/IO/TRLevelReader.cs b/TRLevelControl/IO/TRLevelReader.cs
@@ -43,6 +43,13 @@ public TRLevelReader Inflate(TRChunkType chunkType)
         return new(inflatedStream);
     }
 
+    public uint PeekUInt()
+    {
+        uint value = ReadUInt32();
+        BaseStream.Position -= sizeof(uint);
+        return value;
+    }
+
     public void ReadUntil(long position)
     {
         long distance = position - BaseStream.Position;