diff --git a/TRLevelControl/Model/Base/TRSoundDetails.cs b/TRLevelControl/Model/Base/TRSoundDetails.cs deleted file mode 100644 index 282a447aa..000000000 --- a/TRLevelControl/Model/Base/TRSoundDetails.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System.Text; -using TRLevelControl.Serialization; - -namespace TRLevelControl.Model; - -public class TRSoundDetails : ISerializableCompact -{ - public ushort Sample { get; set; } - - public ushort Volume { get; set; } - - public ushort Chance { get; set; } - - public ushort Characteristics { get; set; } - - public byte LoopingMode - { - get - { - return (byte)(Characteristics & 3); - } - set - { - Characteristics = (ushort)(Characteristics & ~(Characteristics & 3)); - Characteristics |= (ushort)(value & 3); - } - } - - public int NumSounds - { - get - { - return (Characteristics & 0x00FC) >> 2; // get bits 2-7 - } - set - { - Characteristics = (ushort)(Characteristics & ~(Characteristics & 0x00FC)); - Characteristics |= (ushort)(value << 2); - } - } - - public bool Wibble - { - get - { - return (Characteristics & 0x2000) > 0; - } - set - { - if (value) - { - Characteristics |= 0x2000; - } - else - { - Characteristics = (ushort)(Characteristics & ~0x2000); - } - } - } - - public override string ToString() - { - StringBuilder sb = new(base.ToString()); - - sb.Append(" Sample: " + Sample); - sb.Append(" Volume: " + Volume); - sb.Append(" Chance: " + Chance); - sb.Append(" Characteristics: " + Characteristics.ToString("X4")); - sb.Append(" NumSounds: " + NumSounds); - - return sb.ToString(); - } - - public byte[] Serialize() - { - using MemoryStream stream = new(); - using (BinaryWriter writer = new(stream)) - { - writer.Write(Sample); - writer.Write(Volume); - writer.Write(Chance); - writer.Write(Characteristics); - } - - return stream.ToArray(); - } -} diff --git a/TRLevelControl/TR2FileReadUtilities.cs b/TRLevelControl/TR2FileReadUtilities.cs index eee10c444..fadc17c97 100644 --- a/TRLevelControl/TR2FileReadUtilities.cs +++ b/TRLevelControl/TR2FileReadUtilities.cs @@ -340,15 +340,4 @@ public static TRCinematicFrame ReadCinematicFrame(BinaryReader reader) Roll = reader.ReadInt16() }; } - - public static TRSoundDetails ReadSoundDetails(BinaryReader reader) - { - return new TRSoundDetails() - { - Sample = reader.ReadUInt16(), - Volume = reader.ReadUInt16(), - Chance = reader.ReadUInt16(), - Characteristics = reader.ReadUInt16() - }; - } }