diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index bb613d7ea5..393111cf4b 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -72,15 +72,15 @@ uint8_t _vehicleF64E2C; Vehicle* _vehicleFrontVehicle; CoordsXYZ unk_F64E20; -static constexpr const OpenRCT2::Audio::SoundId byte_9A3A14[] = { +static constexpr const OpenRCT2::Audio::SoundId _screamSet0[] = { OpenRCT2::Audio::SoundId::Scream8, OpenRCT2::Audio::SoundId::Scream1, }; -static constexpr const OpenRCT2::Audio::SoundId byte_9A3A16[] = { +static constexpr const OpenRCT2::Audio::SoundId _screamSet2[] = { OpenRCT2::Audio::SoundId::Scream1, OpenRCT2::Audio::SoundId::Scream6, }; -static constexpr const OpenRCT2::Audio::SoundId byte_9A3A18[] = { +static constexpr const OpenRCT2::Audio::SoundId _screamSet1Wooden[] = { OpenRCT2::Audio::SoundId::Scream3, OpenRCT2::Audio::SoundId::Scream1, OpenRCT2::Audio::SoundId::Scream5, OpenRCT2::Audio::SoundId::Scream6, OpenRCT2::Audio::SoundId::Scream7, OpenRCT2::Audio::SoundId::Scream2, OpenRCT2::Audio::SoundId::Scream4, @@ -5577,13 +5577,13 @@ OpenRCT2::Audio::SoundId Vehicle::ProduceScreamSound(const int32_t totalNumPeeps switch (vehicleEntry->sound_range) { case SOUND_RANGE_SCREAMS_0: - scream_sound_id = byte_9A3A14[r % 2]; + scream_sound_id = _screamSet0[r % std::size(_screamSet0)]; break; - case SOUND_RANGE_SCREAMS_1: - scream_sound_id = byte_9A3A18[r % 7]; + case SOUND_RANGE_SCREAMS_1_WOODEN_COASTERS: + scream_sound_id = _screamSet1Wooden[r % std::size(_screamSet1Wooden)]; break; case SOUND_RANGE_SCREAMS_2: - scream_sound_id = byte_9A3A16[r % 2]; + scream_sound_id = _screamSet2[r % std::size(_screamSet2)]; break; default: scream_sound_id = OpenRCT2::Audio::SoundId::NoScream; diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index bbbecea307..de0cc438d5 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -575,7 +575,7 @@ enum enum { SOUND_RANGE_SCREAMS_0 = 0, - SOUND_RANGE_SCREAMS_1 = 1, + SOUND_RANGE_SCREAMS_1_WOODEN_COASTERS = 1, SOUND_RANGE_SCREAMS_2 = 2, SOUND_RANGE_WHISTLE = 3, SOUND_RANGE_BELL = 4,