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

Merge pull request #15488 from ZehMatt/fix-14798 

Fix #14798: Overflow on sound position
This commit is contained in:
ζeh Matt 2021-09-29 13:07:09 -07:00 committed by GitHub
parent 987174e828 98625e1aaa
commit 15547ff8f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,10 +973,11 @@ bool Vehicle::SoundCanPlay() const
if (g_music_tracking_viewport == nullptr)
return false;
int16_t left = g_music_tracking_viewport->viewPos.x;
int16_t bottom = g_music_tracking_viewport->viewPos.y;
int16_t quarter_w = g_music_tracking_viewport->view_width / 4;
int16_t quarter_h = g_music_tracking_viewport->view_height / 4;
const auto quarter_w = g_music_tracking_viewport->view_width / 4;
const auto quarter_h = g_music_tracking_viewport->view_height / 4;
auto left = g_music_tracking_viewport->viewPos.x;
auto bottom = g_music_tracking_viewport->viewPos.y;
if (window_get_classification(gWindowAudioExclusive) == WC_MAIN_WINDOW)
{
@ -987,8 +988,8 @@ bool Vehicle::SoundCanPlay() const
if (left >= SpriteRect.GetRight() || bottom >= SpriteRect.GetBottom())
return false;
int16_t right = g_music_tracking_viewport->view_width + left;
int16_t top = g_music_tracking_viewport->view_height + bottom;
auto right = g_music_tracking_viewport->view_width + left;
auto top = g_music_tracking_viewport->view_height + bottom;
if (window_get_classification(gWindowAudioExclusive) == WC_MAIN_WINDOW)
{