From 44da1a9f7d8a3eb9886a8f53ff394a1608b43fad Mon Sep 17 00:00:00 2001 From: MelonSpeedruns Date: Fri, 8 May 2026 13:51:13 -0400 Subject: [PATCH] Added sounds to Reset & Quit modals (#718) Co-authored-by: MelonSpeedruns --- src/dusk/ui/menu_bar.cpp | 14 ++++++++++++-- src/dusk/ui/modal.cpp | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/dusk/ui/menu_bar.cpp b/src/dusk/ui/menu_bar.cpp index fdd89e6967..81c2eea441 100644 --- a/src/dusk/ui/menu_bar.cpp +++ b/src/dusk/ui/menu_bar.cpp @@ -68,12 +68,17 @@ MenuBar::MenuBar() : Document(kDocumentSource), mRoot(mDocument->GetElementById( { ModalAction{ .label = "Cancel", - .onPressed = dismiss, + .onPressed = + [this, dismiss](Modal& modal) { + mDoAud_seStartMenu(kSoundWindowClose); + dismiss(modal); + }, }, ModalAction{ .label = "Reset", .onPressed = [this, dismiss](Modal& modal) { + mDoAud_seStartMenu(kSoundClick); if (fpcM_SearchByName(fpcNm_LOGO_SCENE_e)) { dismiss(modal); return; @@ -98,12 +103,17 @@ MenuBar::MenuBar() : Document(kDocumentSource), mRoot(mDocument->GetElementById( { ModalAction{ .label = "Cancel", - .onPressed = dismiss, + .onPressed = + [dismiss](Modal& modal) { + mDoAud_seStartMenu(kSoundWindowClose); + dismiss(modal); + }, }, ModalAction{ .label = "Quit", .onPressed = [dismiss](Modal& modal) { + mDoAud_seStartMenu(kSoundClick); dismiss(modal); IsRunning = false; }, diff --git a/src/dusk/ui/modal.cpp b/src/dusk/ui/modal.cpp index 6aa1637de7..b08a333163 100644 --- a/src/dusk/ui/modal.cpp +++ b/src/dusk/ui/modal.cpp @@ -36,6 +36,8 @@ Modal::Modal(Props props) : WindowSmall("modal", "modal-dialog"), mProps(std::mo }); mButtons.push_back(std::move(btn)); } + + mDoAud_seStartMenu(kSoundWindowOpen); } bool Modal::focus() {