mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use coordsXYZ for audio_get_params_from_location

This commit is contained in:
duncanspumpkin 2019-08-18 08:24:22 +01:00
parent 5fe5f8e964
commit 6da5eb9d30
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ static int32_t SoundVolumeAdjust[RCT2SoundCount] =
}; };
// clang-format on // clang-format on
AudioParams audio_get_params_from_location(SoundId soundId, const LocationXYZ16* location); static AudioParams audio_get_params_from_location(SoundId soundId, const CoordsXYZ& location);
void audio_init() void audio_init()
{ {
@ -185,12 +185,7 @@ void audio_play_sound_at_location(SoundId soundId, const CoordsXYZ& loc)
if (gGameSoundsOff) if (gGameSoundsOff)
return; return;
LocationXYZ16 location; AudioParams params = audio_get_params_from_location(soundId, loc);
location.x = loc.x;
location.y = loc.y;
location.z = loc.z;
AudioParams params = audio_get_params_from_location(soundId, &location);
if (params.in_range) if (params.in_range)
{ {
audio_play_sound(soundId, params.volume, params.pan); audio_play_sound(soundId, params.volume, params.pan);
@ -203,7 +198,7 @@ void audio_play_sound_at_location(SoundId soundId, const CoordsXYZ& loc)
* @param location The location at which the sound effect is to be played. * @param location The location at which the sound effect is to be played.
* @return The audio parameters to be used when playing this sound effect. * @return The audio parameters to be used when playing this sound effect.
*/ */
AudioParams audio_get_params_from_location(SoundId soundId, const LocationXYZ16* location) static AudioParams audio_get_params_from_location(SoundId soundId, const CoordsXYZ& location)
{ {
int32_t volumeDown = 0; int32_t volumeDown = 0;
AudioParams params; AudioParams params;
@ -211,14 +206,14 @@ AudioParams audio_get_params_from_location(SoundId soundId, const LocationXYZ16*
params.volume = 0; params.volume = 0;
params.pan = 0; params.pan = 0;
auto element = map_get_surface_element_at({ location->x, location->y }); auto element = map_get_surface_element_at(location);
if (element && (element->base_height * 8) - 5 > location->z) if (element && (element->base_height * 8) - 5 > location.z)
{ {
volumeDown = 10; volumeDown = 10;
} }
uint8_t rotation = get_current_rotation(); uint8_t rotation = get_current_rotation();
LocationXY16 pos2 = coordinate_3d_to_2d(location, rotation); auto pos2 = translate_3d_to_2d_with_z(rotation, location);
rct_viewport* viewport = nullptr; rct_viewport* viewport = nullptr;
while ((viewport = window_get_previous_viewport(viewport)) != nullptr) while ((viewport = window_get_previous_viewport(viewport)) != nullptr)