From 43dbf9eb1834a93186b09ed17079d18f079a37bf Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Mon, 19 Sep 2022 22:38:34 +0200 Subject: [PATCH] Fix #18032: non-interactive widgets produce sound --- distribution/changelog.txt | 1 + src/openrct2-ui/input/MouseInput.cpp | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e69a16f650..8422433193 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -68,6 +68,7 @@ - Fix: [#18009] Visual glitch with litter at edge of sloped path. - Fix: [#18026] Park rating drops to 0 with more than 32k guests, total ride excitement or intensity. - Fix: [#18051] Visual glitch with Mine Ride's large unbanked turn. +- Fix: [#18032] All non-interactive widgets (labels, groupboxes) produce sound when clicked. 0.4.1 (2022-07-04) ------------------------------------------------------------------------ diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 457a92327d..c550e75b02 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -1051,7 +1051,27 @@ static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, W case WindowWidgetType::Scroll: InputScrollBegin(*w, widgetIndex, screenCoords); break; - default: + case WindowWidgetType::Empty: + case WindowWidgetType::LabelCentred: + case WindowWidgetType::Label: + case WindowWidgetType::Groupbox: + case WindowWidgetType::Placeholder: + case WindowWidgetType::Last: + // Non-interactive widget type + break; + case WindowWidgetType::ImgBtn: + case WindowWidgetType::ColourBtn: + case WindowWidgetType::TrnBtn: + case WindowWidgetType::Tab: + case WindowWidgetType::FlatBtn: + case WindowWidgetType::Button: + case WindowWidgetType::TableHeader: + case WindowWidgetType::Spinner: + case WindowWidgetType::DropdownMenu: + case WindowWidgetType::CloseBox: + case WindowWidgetType::Checkbox: + case WindowWidgetType::TextBox: + case WindowWidgetType::Custom: if (!WidgetIsDisabled(*w, widgetIndex)) { OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + widget.midX());