mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #15488 from ZehMatt/fix-14798
Fix #14798: Overflow on sound position
This commit is contained in:
commit
15547ff8f4
|
@ -973,10 +973,11 @@ bool Vehicle::SoundCanPlay() const
|
||||||
if (g_music_tracking_viewport == nullptr)
|
if (g_music_tracking_viewport == nullptr)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
int16_t left = g_music_tracking_viewport->viewPos.x;
|
const auto quarter_w = g_music_tracking_viewport->view_width / 4;
|
||||||
int16_t bottom = g_music_tracking_viewport->viewPos.y;
|
const auto quarter_h = g_music_tracking_viewport->view_height / 4;
|
||||||
int16_t quarter_w = g_music_tracking_viewport->view_width / 4;
|
|
||||||
int16_t 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)
|
if (window_get_classification(gWindowAudioExclusive) == WC_MAIN_WINDOW)
|
||||||
{
|
{
|
||||||
|
@ -987,8 +988,8 @@ bool Vehicle::SoundCanPlay() const
|
||||||
if (left >= SpriteRect.GetRight() || bottom >= SpriteRect.GetBottom())
|
if (left >= SpriteRect.GetRight() || bottom >= SpriteRect.GetBottom())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
int16_t right = g_music_tracking_viewport->view_width + left;
|
auto right = g_music_tracking_viewport->view_width + left;
|
||||||
int16_t top = g_music_tracking_viewport->view_height + bottom;
|
auto top = g_music_tracking_viewport->view_height + bottom;
|
||||||
|
|
||||||
if (window_get_classification(gWindowAudioExclusive) == WC_MAIN_WINDOW)
|
if (window_get_classification(gWindowAudioExclusive) == WC_MAIN_WINDOW)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue