From a288d0b912fdc34a6323a793b4c75441293d5d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:41:24 +0200 Subject: [PATCH 1/2] Fix marketing campaign accessing the widget declaration not instance --- src/openrct2-ui/windows/Finances.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index beb778155e..99f085c7ab 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -760,7 +760,7 @@ namespace OpenRCT2::Ui::Windows // Draw campaign button text for (int32_t i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { - auto campaignButton = &_windowFinancesMarketingWidgets[WIDX_CAMPAIGN_1 + i]; + auto campaignButton = &widgets[WIDX_CAMPAIGN_1 + i]; if (campaignButton->type != WindowWidgetType::Empty) { // Draw button text From 87be9f0f6e35e3ee28e83de5457c1cba45a4a3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:48:06 +0200 Subject: [PATCH 2/2] Use correct widgets instance for Banner window --- src/openrct2-ui/windows/Banner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 5779bc398f..c34210b4d7 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -83,7 +83,7 @@ namespace OpenRCT2::Ui::Windows void CreateViewport() { - const auto& viewportWidget = window_banner_widgets[WIDX_VIEWPORT]; + const auto& viewportWidget = widgets[WIDX_VIEWPORT]; ViewportCreate( this, windowPos + ScreenCoordsXY{ viewportWidget.left + 1, viewportWidget.top + 1 }, (viewportWidget.width()) - 1, (viewportWidget.height()) - 1, Focus(_bannerViewPos));