From afa4c906c5086cbddfbbcdc554d60ec864280143 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Tue, 30 Sep 2025 22:08:27 +0200
Subject: [PATCH] Rename members of VehicleSound

---
 src/openrct2-ui/ride/VehicleSounds.cpp | 16 ++++++++--------
 src/openrct2/audio/Audio.cpp           |  8 ++++----
 src/openrct2/audio/Audio.h             |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp
index 97aed34003..6e0047e54e 100644
--- a/src/openrct2-ui/ride/VehicleSounds.cpp
+++ b/src/openrct2-ui/ride/VehicleSounds.cpp
@@ -363,8 +363,8 @@ namespace OpenRCT2::Audio
             if (vehicleSound.id == kSoundIdNull)
             {
                 vehicleSound.id = sound_params->id;
-                vehicleSound.TrackSound.id = SoundId::Null;
-                vehicleSound.OtherSound.id = SoundId::Null;
+                vehicleSound.trackSound.id = SoundId::Null;
+                vehicleSound.otherSound.id = SoundId::Null;
                 vehicleSound.volume = 0x30;
                 return &vehicleSound;
             }
@@ -567,13 +567,13 @@ namespace OpenRCT2::Audio
                 if (keepPlaying)
                     continue;
 
-                if (vehicleSound.TrackSound.id != SoundId::Null)
+                if (vehicleSound.trackSound.id != SoundId::Null)
                 {
-                    vehicleSound.TrackSound.channel->Stop();
+                    vehicleSound.trackSound.channel->Stop();
                 }
-                if (vehicleSound.OtherSound.id != SoundId::Null)
+                if (vehicleSound.otherSound.id != SoundId::Null)
                 {
-                    vehicleSound.OtherSound.channel->Stop();
+                    vehicleSound.otherSound.channel->Stop();
                 }
                 vehicleSound.id = kSoundIdNull;
             }
@@ -608,9 +608,9 @@ namespace OpenRCT2::Audio
             if (vehicle != nullptr)
             {
                 UpdateSound<SoundType::TrackNoises>(
-                    vehicle->sound1_id, vehicle->sound1_volume, &vehicleSoundParams, vehicleSound->TrackSound, panVol);
+                    vehicle->sound1_id, vehicle->sound1_volume, &vehicleSoundParams, vehicleSound->trackSound, panVol);
                 UpdateSound<SoundType::OtherNoises>(
-                    vehicle->sound2_id, vehicle->sound2_volume, &vehicleSoundParams, vehicleSound->OtherSound, panVol);
+                    vehicle->sound2_id, vehicle->sound2_volume, &vehicleSoundParams, vehicleSound->otherSound, panVol);
             }
         }
     }
diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp
index b2e2cdbf21..f8109f144e 100644
--- a/src/openrct2/audio/Audio.cpp
+++ b/src/openrct2/audio/Audio.cpp
@@ -440,13 +440,13 @@ namespace OpenRCT2::Audio
             if (vehicleSound.id != kSoundIdNull)
             {
                 vehicleSound.id = kSoundIdNull;
-                if (vehicleSound.TrackSound.id != SoundId::Null)
+                if (vehicleSound.trackSound.id != SoundId::Null)
                 {
-                    vehicleSound.TrackSound.channel->Stop();
+                    vehicleSound.trackSound.channel->Stop();
                 }
-                if (vehicleSound.OtherSound.id != SoundId::Null)
+                if (vehicleSound.otherSound.id != SoundId::Null)
                 {
-                    vehicleSound.OtherSound.channel->Stop();
+                    vehicleSound.otherSound.channel->Stop();
                 }
             }
         }
diff --git a/src/openrct2/audio/Audio.h b/src/openrct2/audio/Audio.h
index ba88c62d1c..44cbdc6935 100644
--- a/src/openrct2/audio/Audio.h
+++ b/src/openrct2/audio/Audio.h
@@ -46,8 +46,8 @@ namespace OpenRCT2::Audio
     {
         uint16_t id;
         int16_t volume;
-        Sound TrackSound;
-        Sound OtherSound;
+        Sound trackSound;
+        Sound otherSound;
     };
 
     struct VehicleSoundParams