From e636c8044d1adc71c096fd093e0af431e384e458 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 16 Oct 2020 23:25:28 +0200 Subject: [PATCH] - fixed menu sound. --- src/menu/doommenu.cpp | 2 +- wadsrc/static/zscript/ui/menu/doommenus.zs | 9 +++++++++ wadsrc/static/zscript/ui/menu/optionmenuitems.zs | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/menu/doommenu.cpp b/src/menu/doommenu.cpp index 268e3ddc3..7fc4fa765 100644 --- a/src/menu/doommenu.cpp +++ b/src/menu/doommenu.cpp @@ -1262,7 +1262,7 @@ void SetDefaultMenuColors() OptionSettings.mFontColorHighlight = V_FindFontColor(gameinfo.mFontColorHighlight); OptionSettings.mFontColorSelection = V_FindFontColor(gameinfo.mFontColorSelection); - auto cls = PClass::FindClass("MenuDelegateBase"); + auto cls = PClass::FindClass("DoomMenuDelegate"); menuDelegate = cls->CreateNew(); } diff --git a/wadsrc/static/zscript/ui/menu/doommenus.zs b/wadsrc/static/zscript/ui/menu/doommenus.zs index 6e727d4ae..969437a8b 100644 --- a/wadsrc/static/zscript/ui/menu/doommenus.zs +++ b/wadsrc/static/zscript/ui/menu/doommenus.zs @@ -63,3 +63,12 @@ class VideoModeMenu : OptionMenu return false; } } + +class DoomMenuDelegate : MenuDelegateBase +{ + override void PlaySound(Name snd) + { + String s = snd; + S_StartSound (s, CHAN_VOICE, CHANF_UI, snd_menuvolume); + } +} diff --git a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs index 28b48310b..3a69f5bee 100644 --- a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs +++ b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs @@ -122,7 +122,7 @@ class OptionMenuItemSubmenu : OptionMenuItem override bool Activate() { - Menu.MenuSound("menu/choose"); + Menu.MenuSound("menu/advance"); Menu.SetMenu(mAction, mParam); return true; }