From 98625e1aaaa011f3924588368b3b3f7d883e09aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 29 Sep 2021 22:04:44 +0300
Subject: [PATCH] Fix #14798: Overflow on sound position

---
 src/openrct2/ride/Vehicle.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 014527677b..36b236a7f4 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -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)
     {