mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Renamed sound enums for accuracy and organization

Browse Source
This commit is contained in:
Cody Brittain
2019-07-20 06:41:36 -04:00
committed by Michael Steenbeek
parent 4170255296
commit 5342a6d9a9
6 changed files with 102 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/Intro.cpp
View File

@@ -55,7 +55,7 @@ void intro_update()
_introStateCounter = -580;
// Play the chain lift sound
_soundChannel = Mixer_Play_Effect(SOUND_LIFT_7, MIXER_LOOP_INFINITE, MIXER_VOLUME_MAX, 0.5f, 1, true);
_soundChannel = Mixer_Play_Effect(SOUND_LIFT_BM, MIXER_LOOP_INFINITE, MIXER_VOLUME_MAX, 0.5f, 1, true);
_chainLiftFinished = false;
gIntroState++;
break;
@@ -94,7 +94,7 @@ void intro_update()
// Play the track friction sound
_soundChannel = Mixer_Play_Effect(
SOUND_TRACK_FRICTION_3, MIXER_LOOP_INFINITE, MIXER_VOLUME_MAX, 0.25f, 0.75, true);
SOUND_TRACK_FRICTION_BM, MIXER_LOOP_INFINITE, MIXER_VOLUME_MAX, 0.25f, 0.75, true);
}
// Check if logo is off the screen...ish

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

@@ -59,9 +59,9 @@ rct_vehicle_sound_params* gVehicleSoundParamsListEnd;
// clang-format off
static int32_t SoundVolumeAdjust[SOUND_MAXID] =
{
0, // SOUND_LIFT_1
0, // SOUND_TRACK_FRICTION_1
0, // SOUND_LIFT_2
0, // SOUND_LIFT_CLASSIC
0, // SOUND_TRACK_FRICTION_CLASSIC_WOOD
0, // SOUND_FRICTION_CLASSIC
0, // SOUND_SCREAM_1
0, // SOUND_CLICK_1
0, // SOUND_CLICK_2
@@ -71,27 +71,27 @@ static int32_t SoundVolumeAdjust[SOUND_MAXID] =
0, // SOUND_SCREAM_4
0, // SOUND_SCREAM_5
0, // SOUND_SCREAM_6
0, // SOUND_LIFT_3
0, // SOUND_LIFT_FRICTION_WHEELS
-400, // SOUND_PURCHASE
0, // SOUND_CRASH
0, // SOUND_LAYING_OUT_WATER
0, // SOUND_WATER_1
0, // SOUND_WATER_2
0, // SOUND_TRAIN_WHISTLE
0, // SOUND_TRAIN_CHUGGING
0, // SOUND_TRAIN_DEPARTING
-1000, // SOUND_WATER_SPLASH
0, // SOUND_HAMMERING
0, // SOUND_GO_KART_ENGINE
-800, // SOUND_RIDE_LAUNCH_1
-1700, // SOUND_RIDE_LAUNCH_2
-700, // SOUND_COUGH_1
-700, // SOUND_COUGH_2
-700, // SOUND_COUGH_3
-700, // SOUND_COUGH_4
0, // SOUND_RAIN_1
0, // SOUND_RAIN
0, // SOUND_THUNDER_1
0, // SOUND_THUNDER_2
0, // SOUND_RAIN_2
0, // SOUND_RAIN_3
0, // SOUND_TRACK_FRICTION_TRAIN
0, // SOUND_TRACK_FRICTION_WATER
0, // SOUND_BALLOON_POP
-700, // SOUND_MECHANIC_FIX
0, // SOUND_SCREAM_7
@@ -107,21 +107,21 @@ static int32_t SoundVolumeAdjust[SOUND_MAXID] =
-600, // SOUND_HAUNTED_HOUSE_SCARE
-700, // SOUND_HAUNTED_HOUSE_SCREAM_1
-700, // SOUND_HAUNTED_HOUSE_SCREAM_2
-2550, // SOUND_48
-2900, // SOUND_49
-2550, // SOUND_BLOCK_BRAKE_CLOSE
-2900, // SOUND_BLOCK_BRAKE_RELEASE
0, // SOUND_ERROR
-3400, // SOUND_51
0, // SOUND_LIFT_4
0, // SOUND_LIFT_5
0, // SOUND_TRACK_FRICTION_2
0, // SOUND_LIFT_6
0, // SOUND_LIFT_7
0, // SOUND_TRACK_FRICTION_3
-3400, // SOUND_BRAKE_RELEASE
0, // SOUND_LIFT_ARROW
0, // SOUND_LIFT_WOOD
0, // SOUND_TRACK_FRICTION_WOOD
0, // SOUND_LIFT_WILD_MOUSE
0, // SOUND_LIFT_BM
0, // SOUND_TRACK_FRICTION_BM
0, // SOUND_SCREAM_8
0, // SOUND_TRAM
-2000, // SOUND_DOOR_OPEN
-2700, // SOUND_DOOR_CLOSE
-700 // SOUND_62
-700 // SOUND_PORTCULLIS
};
// clang-format on

38
src/openrct2/audio/audio.h
View File

@@ -80,9 +80,9 @@ struct rct_vehicle_sound_params
enum RCT2_SOUND
{
SOUND_LIFT_1,
SOUND_TRACK_FRICTION_1,
SOUND_LIFT_2,
SOUND_LIFT_CLASSIC,
SOUND_TRACK_FRICTION_CLASSIC_WOOD,
SOUND_FRICTION_CLASSIC,
SOUND_SCREAM_1,
SOUND_CLICK_1,
SOUND_CLICK_2,
@@ -92,27 +92,27 @@ enum RCT2_SOUND
SOUND_SCREAM_4,
SOUND_SCREAM_5,
SOUND_SCREAM_6,
SOUND_LIFT_3,
SOUND_LIFT_FRICTION_WHEELS,
SOUND_PURCHASE,
SOUND_CRASH,
SOUND_LAYING_OUT_WATER,
SOUND_WATER_1,
SOUND_WATER_2,
SOUND_TRAIN_WHISTLE,
SOUND_TRAIN_CHUGGING,
SOUND_TRAIN_DEPARTING,
SOUND_WATER_SPLASH,
SOUND_HAMMERING,
SOUND_GO_KART_ENGINE,
SOUND_RIDE_LAUNCH_1,
SOUND_RIDE_LAUNCH_2,
SOUND_COUGH_1,
SOUND_COUGH_2,
SOUND_COUGH_3,
SOUND_COUGH_4,
SOUND_RAIN_1,
SOUND_RAIN,
SOUND_THUNDER_1,
SOUND_THUNDER_2,
SOUND_RAIN_2,
SOUND_RAIN_3,
SOUND_TRACK_FRICTION_TRAIN,
SOUND_TRACK_FRICTION_WATER,
SOUND_BALLOON_POP,
SOUND_MECHANIC_FIX,
SOUND_SCREAM_7,
@@ -128,21 +128,21 @@ enum RCT2_SOUND
SOUND_HAUNTED_HOUSE_SCARE,
SOUND_HAUNTED_HOUSE_SCREAM_1,
SOUND_HAUNTED_HOUSE_SCREAM_2,
SOUND_48,
SOUND_49,
SOUND_BLOCK_BRAKE_CLOSE,
SOUND_BLOCK_BRAKE_RELEASE,
SOUND_ERROR,
SOUND_51,
SOUND_LIFT_4,
SOUND_LIFT_5,
SOUND_TRACK_FRICTION_2,
SOUND_LIFT_6,
SOUND_LIFT_7,
SOUND_TRACK_FRICTION_3,
SOUND_BRAKE_RELEASE,
SOUND_LIFT_ARROW,
SOUND_LIFT_WOOD,
SOUND_TRACK_FRICTION_WOOD,
SOUND_LIFT_WILD_MOUSE,
SOUND_LIFT_BM,
SOUND_TRACK_FRICTION_BM,
SOUND_SCREAM_8,
SOUND_TRAM,
SOUND_DOOR_OPEN,
SOUND_DOOR_CLOSE,
SOUND_62,
SOUND_PORTCULLIS,
SOUND_MAXID
};

70
src/openrct2/ride/RideData.cpp
View File

@@ -1450,26 +1450,26 @@ const uint16_t RideCrookedHouseLength[1] = {
/* rct2: 0x0097D7C8, 0x0097D7C9, 0x0097D7CA */
const rct_ride_lift_data RideLiftData[] = {
{ SOUND_LIFT_3, 7, 7 }, // Spiral Roller coaster
{ SOUND_LIFT_1, 4, 6 }, // Stand Up Coaster
{ SOUND_LIFT_1, 4, 6 }, // Suspended Swinging
{ SOUND_LIFT_7, 5, 7 }, // Inverted
{ SOUND_LIFT_3, 4, 6 }, // Steel Mini Coaster
{ SOUND_LIFT_FRICTION_WHEELS, 7, 7 }, // Spiral Roller coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Stand Up Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Suspended Swinging
{ SOUND_LIFT_BM, 5, 7 }, // Inverted
{ SOUND_LIFT_FRICTION_WHEELS, 4, 6 }, // Steel Mini Coaster
{ 255, 5, 5 }, // Mini Railway
{ 255, 5, 5 }, // Monorail
{ SOUND_LIFT_3, 4, 5 }, // Mini Suspended Coaster
{ SOUND_LIFT_FRICTION_WHEELS, 4, 5 }, // Mini Suspended Coaster
{ 255, 5, 5 }, // Boat Hire
{ SOUND_LIFT_1, 4, 5 }, // Wooden Wild Mine/Mouse
{ SOUND_LIFT_1, 4, 5 }, // Steeplechase/Motorbike/Soap Box D
{ SOUND_LIFT_CLASSIC, 4, 5 }, // Wooden Wild Mine/Mouse
{ SOUND_LIFT_CLASSIC, 4, 5 }, // Steeplechase/Motorbike/Soap Box D
{ 255, 5, 5 }, // Car Ride
{ 255, 5, 5 }, // Launched Freefall
{ SOUND_LIFT_3, 4, 5 }, // Bobsleigh Coaster
{ SOUND_LIFT_FRICTION_WHEELS, 4, 5 }, // Bobsleigh Coaster
{ 255, 5, 5 }, // Observation Tower
{ SOUND_LIFT_1, 4, 6 }, // Looping Roller Coaster
{ SOUND_LIFT_3, 4, 5 }, // Dinghy Slide
{ SOUND_LIFT_4, 4, 6 }, // Mine Train Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Looping Roller Coaster
{ SOUND_LIFT_FRICTION_WHEELS, 4, 5 }, // Dinghy Slide
{ SOUND_LIFT_ARROW, 4, 6 }, // Mine Train Coaster
{ 255, 5, 5 }, // Chairlift
{ SOUND_LIFT_4, 4, 6 }, // Corkscrew Roller Coaster
{ SOUND_LIFT_ARROW, 4, 6 }, // Corkscrew Roller Coaster
{ 255, 5, 5 }, // Maze
{ 255, 5, 5 }, // Spiral Slide
{ 255, 5, 5 }, // Go Karts
@@ -1494,39 +1494,39 @@ const rct_ride_lift_data RideLiftData[] = {
{ 255, 5, 5 }, // Space Rings
{ 255, 5, 5 }, // Reverse Freefall Coaster
{ 255, 5, 5 }, // Elevator
{ SOUND_LIFT_7, 4, 5 }, // Vertical Drop Roller Coaster
{ SOUND_LIFT_BM, 4, 5 }, // Vertical Drop Roller Coaster
{ 255, 5, 5 }, // ATM
{ 255, 5, 5 }, // Twist
{ 255, 5, 5 }, // Haunted House
{ 255, 5, 5 }, // First Aid
{ 255, 5, 5 }, // Circus Show
{ 255, 5, 5 }, // Ghost Train
{ SOUND_LIFT_7, 5, 8 }, // Twister Roller Coaster
{ SOUND_LIFT_5, 5, 7 }, // Wooden Roller Coaster
{ SOUND_LIFT_5, 3, 4 }, // Side-Friction Roller Coaster
{ SOUND_LIFT_6, 4, 6 }, // Wild Mouse
{ SOUND_LIFT_3, 4, 6 }, // Multi Dimension Coaster
{ SOUND_LIFT_3, 4, 6 }, // (none)
{ SOUND_LIFT_7, 4, 6 }, // Flying Roller Coaster
{ SOUND_LIFT_7, 4, 6 }, // (none)
{ SOUND_LIFT_1, 3, 4 }, // Virginia Reel
{ SOUND_LIFT_BM, 5, 8 }, // Twister Roller Coaster
{ SOUND_LIFT_WOOD, 5, 7 }, // Wooden Roller Coaster
{ SOUND_LIFT_WOOD, 3, 4 }, // Side-Friction Roller Coaster
{ SOUND_LIFT_WILD_MOUSE, 4, 6 }, // Wild Mouse
{ SOUND_LIFT_FRICTION_WHEELS, 4, 6 }, // Multi Dimension Coaster
{ SOUND_LIFT_FRICTION_WHEELS, 4, 6 }, // (none)
{ SOUND_LIFT_BM, 4, 6 }, // Flying Roller Coaster
{ SOUND_LIFT_BM, 4, 6 }, // (none)
{ SOUND_LIFT_CLASSIC, 3, 4 }, // Virginia Reel
{ 255, 5, 5 }, // Splash Boats
{ 255, 5, 5 }, // Mini Helicopters
{ SOUND_LIFT_1, 4, 6 }, // Lay-down Roller Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Lay-down Roller Coaster
{ 255, 5, 5 }, // Suspended Monorail
{ SOUND_LIFT_1, 4, 6 }, // (none)
{ SOUND_LIFT_1, 3, 4 }, // Reverser Roller Coaster
{ SOUND_LIFT_1, 4, 6 }, // Heartline Twister Roller Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // (none)
{ SOUND_LIFT_CLASSIC, 3, 4 }, // Reverser Roller Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Heartline Twister Roller Coaster
{ 255, 5, 5 }, // Mini Golf
{ SOUND_LIFT_1, 5, 8 }, // Giga Coaster
{ SOUND_LIFT_CLASSIC, 5, 8 }, // Giga Coaster
{ 255, 5, 5 }, // Roto-Drop
{ 255, 5, 5 }, // Flying Saucers
{ 255, 5, 5 }, // Crooked House
{ 255, 5, 5 }, // Monorail Cycles
{ SOUND_LIFT_3, 4, 6 }, // Compact Inverted Coaster
{ SOUND_LIFT_1, 4, 6 }, // Water Coaster
{ SOUND_LIFT_FRICTION_WHEELS, 4, 6 }, // Compact Inverted Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Water Coaster
{ 255, 5, 5 }, // Air Powered Vertical Coaster
{ SOUND_LIFT_6, 4, 6 }, // Inverted Hairpin Coaster
{ SOUND_LIFT_WILD_MOUSE, 4, 6 }, // Inverted Hairpin Coaster
{ 255, 5, 5 }, // Magic Carpet
{ 255, 5, 5 }, // Submarine Ride
{ 255, 5, 5 }, // River Rafts
@@ -1535,11 +1535,11 @@ const rct_ride_lift_data RideLiftData[] = {
{ 255, 5, 5 }, // (none)
{ 255, 5, 5 }, // (none)
{ 255, 5, 5 }, // (none)
{ SOUND_LIFT_4, 4, 7 }, // (none)
{ SOUND_LIFT_1, 4, 7 }, // Inverted Impulse Coaster
{ SOUND_LIFT_1, 4, 6 }, // Mini Roller Coaster
{ SOUND_LIFT_ARROW, 4, 7 }, // (none)
{ SOUND_LIFT_CLASSIC, 4, 7 }, // Inverted Impulse Coaster
{ SOUND_LIFT_CLASSIC, 4, 6 }, // Mini Roller Coaster
{ 255, 5, 5 }, // Mine Ride
{ SOUND_LIFT_6, 4, 6 }, // (none)
{ SOUND_LIFT_WILD_MOUSE, 4, 6 }, // (none)
{ 255, 4, 6 } // LIM Launched Roller Coaster
};

51
src/openrct2/ride/Vehicle.cpp
View File

@@ -117,9 +117,9 @@ static constexpr const uint8_t byte_9A3A18[] = {
};
static constexpr const uint8_t _soundParams[SOUND_MAXID][2] =
{
{ 1, 0 }, // SOUND_LIFT_1
{ 1, 0 }, // SOUND_TRACK_FRICTION_1
{ 1, 0 }, // SOUND_LIFT_2
{ 1, 0 }, // SOUND_LIFT_CLASSIC
{ 1, 0 }, // SOUND_TRACK_FRICTION_CLASSIC_WOOD
{ 1, 0 }, // SOUND_FRICTION_CLASSIC
{ 0, 1 }, // SOUND_SCREAM_1
{ 0, 0 }, // SOUND_CLICK_1
{ 0, 0 }, // SOUND_CLICK_2
@@ -129,27 +129,27 @@ static constexpr const uint8_t _soundParams[SOUND_MAXID][2] =
{ 0, 1 }, // SOUND_SCREAM_4
{ 0, 1 }, // SOUND_SCREAM_5
{ 0, 1 }, // SOUND_SCREAM_6
{ 1, 0 }, // SOUND_LIFT_3
{ 1, 0 }, // SOUND_LIFT_FRICTION_WHEELS
{ 0, 0 }, // SOUND_PURCHASE
{ 0, 0 }, // SOUND_CRASH
{ 0, 0 }, // SOUND_LAYING_OUT_WATER
{ 0, 0 }, // SOUND_WATER_1
{ 0, 0 }, // SOUND_WATER_2
{ 0, 1 }, // SOUND_TRAIN_WHISTLE
{ 0, 1 }, // SOUND_TRAIN_CHUGGING
{ 0, 1 }, // SOUND_TRAIN_DEPARTING
{ 0, 0 }, // SOUND_WATER_SPLASH
{ 1, 0 }, // SOUND_HAMMERING
{ 1, 0 }, // SOUND_GO_KART_ENGINE
{ 0, 0 }, // SOUND_RIDE_LAUNCH_1
{ 0, 0 }, // SOUND_RIDE_LAUNCH_2
{ 0, 0 }, // SOUND_COUGH_1
{ 0, 0 }, // SOUND_COUGH_2
{ 0, 0 }, // SOUND_COUGH_3
{ 0, 0 }, // SOUND_COUGH_4
{ 1, 0 }, // SOUND_RAIN_1
{ 1, 0 }, // SOUND_RAIN
{ 0, 0 }, // SOUND_THUNDER_1
{ 0, 0 }, // SOUND_THUNDER_2
{ 1, 0 }, // SOUND_RAIN_2
{ 1, 0 }, // SOUND_RAIN_3
{ 1, 0 }, // SOUND_TRACK_FRICTION_TRAIN
{ 1, 0 }, // SOUND_TRACK_FRICTION_WATER
{ 0, 0 }, // SOUND_BALLOON_POP
{ 0, 0 }, // SOUND_MECHANIC_FIX
{ 0, 1 }, // SOUND_SCREAM_7
@@ -165,21 +165,21 @@ static constexpr const uint8_t _soundParams[SOUND_MAXID][2] =
{ 0, 0 }, // SOUND_HAUNTED_HOUSE_SCARE
{ 0, 0 }, // SOUND_HAUNTED_HOUSE_SCREAM_1
{ 0, 0 }, // SOUND_HAUNTED_HOUSE_SCREAM_2
{ 0, 0 }, // SOUND_48
{ 0, 0 }, // SOUND_49
{ 0, 0 }, // SOUND_BLOCK_BRAKE_CLOSE
{ 0, 0 }, // SOUND_BLOCK_BRAKE_RELEASE
{ 0, 0 }, // SOUND_ERROR
{ 0, 0 }, // SOUND_51
{ 1, 0 }, // SOUND_LIFT_4
{ 1, 0 }, // SOUND_LIFT_5
{ 1, 0 }, // SOUND_TRACK_FRICTION_2
{ 1, 0 }, // SOUND_LIFT_6
{ 1, 0 }, // SOUND_LIFT_7
{ 1, 2 }, // SOUND_TRACK_FRICTION_3
{ 0, 0 }, // SOUND_BRAKE_RELEASE
{ 1, 0 }, // SOUND_LIFT_ARROW
{ 1, 0 }, // SOUND_LIFT_WOOD
{ 1, 0 }, // SOUND_TRACK_FRICTION_WOOD
{ 1, 0 }, // SOUND_LIFT_WILD_MOUSE
{ 1, 0 }, // SOUND_LIFT_BM
{ 1, 2 }, // SOUND_TRACK_FRICTION_BM
{ 0, 1 }, // SOUND_SCREAM_8
{ 0, 1 }, // SOUND_TRAM
{ 0, 0 }, // SOUND_DOOR_OPEN
{ 0, 0 }, // SOUND_DOOR_CLOSE
{ 0, 0 } // SOUND_62
{ 0, 0 } // SOUND_PORTCULLIS
};
static constexpr const uint8_t SpaceRingsTimeToSpriteMap[] =
@@ -694,13 +694,13 @@ static constexpr const LocationXY16 AvoidCollisionMoveOffset[] =
static constexpr const uint8_t DoorOpenSoundIds[] =
{
SOUND_DOOR_OPEN,
SOUND_62
SOUND_PORTCULLIS
};
static constexpr const uint8_t DoorCloseSoundIds[] =
{
SOUND_DOOR_CLOSE,
SOUND_62
SOUND_PORTCULLIS
};
static const struct
@@ -3187,7 +3187,7 @@ static void vehicle_update_departing(rct_vehicle* vehicle)
if (rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_DEPART_SOUND)
{
uint8_t soundId = (rideEntry->vehicles[0].sound_range == 4) ? SOUND_TRAM : SOUND_TRAIN_CHUGGING;
uint8_t soundId = (rideEntry->vehicles[0].sound_range == 4) ? SOUND_TRAM : SOUND_TRAIN_DEPARTING;
audio_play_sound_at_location(soundId, vehicle->x, vehicle->y, vehicle->z);
}
@@ -6709,7 +6709,7 @@ static void vehicle_update_block_brakes_open_previous_section(rct_vehicle* vehic
Ride* ride = get_ride(vehicle->ride);
if (ride->IsBlockSectioned())
{
audio_play_sound_at_location(SOUND_48, x, y, z);
audio_play_sound_at_location(SOUND_BLOCK_BRAKE_CLOSE, x, y, z);
}
}
}
@@ -7888,7 +7888,8 @@ static bool vehicle_update_track_motion_forwards_get_new_track(
{
if (!(rideEntry->vehicles[0].flags & VEHICLE_ENTRY_FLAG_POWERED))
{
audio_play_sound_at_location(SOUND_49, vehicle->track_x, vehicle->track_y, vehicle->track_z);
audio_play_sound_at_location(
SOUND_BLOCK_BRAKE_RELEASE, vehicle->track_x, vehicle->track_y, vehicle->track_z);
}
}
map_invalidate_element(vehicle->track_x, vehicle->track_z, tileElement);
@@ -8095,7 +8096,7 @@ loc_6DAEB9:
if (_vehicleF64E2C == 0)
{
_vehicleF64E2C++;
audio_play_sound_at_location(SOUND_51, vehicle->x, vehicle->y, vehicle->z);
audio_play_sound_at_location(SOUND_BRAKE_RELEASE, vehicle->x, vehicle->y, vehicle->z);
}
}
}

2
src/openrct2/world/Climate.cpp
View File

@@ -282,7 +282,7 @@ static void climate_update_rain_sound()
// Start playing the rain sound
if (gRainSoundChannel == nullptr)
{
gRainSoundChannel = Mixer_Play_Effect(SOUND_RAIN_1, MIXER_LOOP_INFINITE, DStoMixerVolume(-4000), 0.5f, 1, 0);
gRainSoundChannel = Mixer_Play_Effect(SOUND_RAIN, MIXER_LOOP_INFINITE, DStoMixerVolume(-4000), 0.5f, 1, 0);
}
if (_rainVolume == 1)
{