mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Rename members of VehicleSound

Browse Source
This commit is contained in:
Gymnasiast
2025-09-30 22:08:27 +02:00
parent 7a0f201899
commit afa4c906c5
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2-ui/ride/VehicleSounds.cpp
View File

@@ -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);
}
}
}

8
src/openrct2/audio/Audio.cpp
View File

@@ -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();
}
}
}

4
src/openrct2/audio/Audio.h
View File

@@ -46,8 +46,8 @@ namespace OpenRCT2::Audio
{
uint16_t id;
int16_t volume;
Sound TrackSound;
Sound OtherSound;
Sound trackSound;
Sound otherSound;
};
struct VehicleSoundParams