mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Rename g_music_tracking_viewport to gMusicTrackingViewport

Browse Source
This commit is contained in:
Gymnasiast
2025-09-16 00:11:31 +02:00
parent b6e09bbc7e
commit 28fbe83a27
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2-ui/ride/VehicleSounds.cpp
View File

@@ -118,14 +118,14 @@ namespace OpenRCT2::Audio
if (vehicle.x == kLocationNull)
return false;
if (g_music_tracking_viewport == nullptr)
if (gMusicTrackingViewport == nullptr)
return false;
const auto quarter_w = g_music_tracking_viewport->ViewWidth() / 4;
const auto quarter_h = g_music_tracking_viewport->ViewHeight() / 4;
const auto quarter_w = gMusicTrackingViewport->ViewWidth() / 4;
const auto quarter_h = gMusicTrackingViewport->ViewHeight() / 4;
auto left = g_music_tracking_viewport->viewPos.x;
auto bottom = g_music_tracking_viewport->viewPos.y;
auto left = gMusicTrackingViewport->viewPos.x;
auto bottom = gMusicTrackingViewport->viewPos.y;
if (Ui::Windows::WindowGetClassification(*gWindowAudioExclusive) == WindowClass::MainWindow)
{
@@ -136,8 +136,8 @@ namespace OpenRCT2::Audio
if (left >= vehicle.SpriteData.SpriteRect.GetRight() || bottom >= vehicle.SpriteData.SpriteRect.GetBottom())
return false;
auto right = g_music_tracking_viewport->ViewWidth() + left;
auto top = g_music_tracking_viewport->ViewHeight() + bottom;
auto right = gMusicTrackingViewport->ViewWidth() + left;
auto top = gMusicTrackingViewport->ViewHeight() + bottom;
if (Ui::Windows::WindowGetClassification(*gWindowAudioExclusive) == WindowClass::MainWindow)
{
@@ -176,9 +176,9 @@ namespace OpenRCT2::Audio
VehicleSoundParams param;
param.priority = priority;
int32_t panX = (vehicle.SpriteData.SpriteRect.GetLeft() / 2) + (vehicle.SpriteData.SpriteRect.GetRight() / 2)
- g_music_tracking_viewport->viewPos.x;
panX = g_music_tracking_viewport->zoom.ApplyInversedTo(panX);
panX += g_music_tracking_viewport->pos.x;
- gMusicTrackingViewport->viewPos.x;
panX = gMusicTrackingViewport->zoom.ApplyInversedTo(panX);
panX += gMusicTrackingViewport->pos.x;
uint16_t screenWidth = ContextGetWidth();
if (screenWidth < 64)
@@ -188,9 +188,9 @@ namespace OpenRCT2::Audio
param.pan_x = ((((panX * 65536) / screenWidth) - 0x8000) >> 4);
int32_t panY = (vehicle.SpriteData.SpriteRect.GetTop() / 2) + (vehicle.SpriteData.SpriteRect.GetBottom() / 2)
- g_music_tracking_viewport->viewPos.y;
panY = g_music_tracking_viewport->zoom.ApplyInversedTo(panY);
panY += g_music_tracking_viewport->pos.y;
- gMusicTrackingViewport->viewPos.y;
panY = gMusicTrackingViewport->zoom.ApplyInversedTo(panY);
panY += gMusicTrackingViewport->pos.y;
uint16_t screenHeight = ContextGetHeight();
if (screenHeight < 64)
@@ -273,7 +273,7 @@ namespace OpenRCT2::Audio
static void VehicleSoundsUpdateWindowSetup()
{
g_music_tracking_viewport = nullptr;
gMusicTrackingViewport = nullptr;
WindowBase* window = Ui::Windows::WindowGetListening();
if (window == nullptr)
@@ -287,7 +287,7 @@ namespace OpenRCT2::Audio
return;
}
g_music_tracking_viewport = viewport;
gMusicTrackingViewport = viewport;
gWindowAudioExclusive = window;
if (viewport->zoom <= ZoomLevel{ 0 })
gVolumeAdjustZoom = 0;

2
src/openrct2/entity/Peep.cpp
View File

@@ -1151,7 +1151,7 @@ void PeepUpdateCrowdNoise()
if (gLegacyScene == LegacyScene::scenarioEditor)
return;
auto viewport = g_music_tracking_viewport;
auto viewport = gMusicTrackingViewport;
if (viewport == nullptr)
return;

2
src/openrct2/interface/Viewport.cpp
View File

@@ -67,7 +67,7 @@ namespace OpenRCT2
uint8_t gShowConstructionRightsRefCount;
static std::list<Viewport> _viewports;
Viewport* g_music_tracking_viewport;
Viewport* gMusicTrackingViewport;
static std::unique_ptr<JobPool> _paintJobs;
static std::vector<PaintSession*> _paintColumns;

2
src/openrct2/interface/Viewport.h
View File

@@ -181,7 +181,7 @@ namespace OpenRCT2
extern uint8_t gShowConstructionRightsRefCount;
// rct2: 0x014234BC
extern Viewport* g_music_tracking_viewport;
extern Viewport* gMusicTrackingViewport;
void ViewportInitAll();
std::optional<ScreenCoordsXY> centre_2d_coordinates(const CoordsXYZ& loc, Viewport* viewport);

4
src/openrct2/interface/Window.cpp
View File

@@ -814,7 +814,7 @@ static constexpr float kWindowScrollLocations[][2] = {
void WindowUpdateViewportRideMusic()
{
RideAudio::ClearAllViewportInstances();
g_music_tracking_viewport = nullptr;
gMusicTrackingViewport = nullptr;
for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++)
{
@@ -823,7 +823,7 @@ static constexpr float kWindowScrollLocations[][2] = {
if (viewport == nullptr || !(viewport->flags & VIEWPORT_FLAG_SOUND_ON))
continue;
g_music_tracking_viewport = viewport;
gMusicTrackingViewport = viewport;
gWindowAudioExclusive = w;
if (viewport->zoom <= ZoomLevel{ 0 })

4
src/openrct2/ride/RideAudio.cpp
View File

@@ -381,10 +381,10 @@ namespace OpenRCT2::RideAudio
*/
void UpdateMusicInstance(Ride& ride, const CoordsXYZ& rideCoords, uint16_t sampleRate)
{
if (gLegacyScene != LegacyScene::scenarioEditor && !gGameSoundsOff && g_music_tracking_viewport != nullptr)
if (gLegacyScene != LegacyScene::scenarioEditor && !gGameSoundsOff && gMusicTrackingViewport != nullptr)
{
auto rotatedCoords = Translate3DTo2DWithZ(GetCurrentRotation(), rideCoords);
auto viewport = g_music_tracking_viewport;
auto viewport = gMusicTrackingViewport;
auto viewWidth = viewport->ViewWidth();
auto viewWidth2 = viewWidth * 2;
auto viewX = viewport->viewPos.x - viewWidth2;