From 4d2efa0edcffa89c21247219c0fd37d3c59c0c3e Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 1 Sep 2024 06:57:56 -0300 Subject: [PATCH] Fix #22672: Loud sound effects on title screen --- src/openrct2-ui/windows/Main.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index a94227003b..bc1b991ec2 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -36,9 +36,9 @@ static Widget _mainWidgets[] = { widgets = _mainWidgets; ViewportCreate(this, windowPos, width, height, Focus(CoordsXYZ(0x0FFF, 0x0FFF, 0))); - if (viewport != nullptr && !(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) + if (viewport != nullptr) { - SetViewportFlags(); + SetViewportFlags(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO); viewport->rotation = 0; } gShowGridLinesRefCount = 0; @@ -53,9 +53,14 @@ static Widget _mainWidgets[] = { } private: - void SetViewportFlags() + void SetViewportFlags(bool isTitleWindow) { viewport->flags |= VIEWPORT_FLAG_SOUND_ON; + if (isTitleWindow) + { + return; + } + if (Config::Get().general.InvisibleRides) { viewport->flags |= VIEWPORT_FLAG_INVISIBLE_RIDES;