Revise button sound

diff --git a/qcsrc/menu/item/button.c b/qcsrc/menu/item/button.c
index 3af4d4787d3cae0f0d056401cf3a467d752d9132..d2cb969f2568c20303562e12c310d6e554db97ae 100644 (file)
--- a/qcsrc/menu/item/button.c
+++ b/qcsrc/menu/item/button.c
@@ -8,6 +8,7 @@ CLASS(Button) EXTENDS(Label)
        METHOD(Button, mousePress, float(entity, vector))
        METHOD(Button, mouseDrag, float(entity, vector))
        METHOD(Button, mouseRelease, float(entity, vector))
+       METHOD(Button, playClickSound, void(entity))
        ATTRIB(Button, onClick, void(entity, entity), func_null)
        ATTRIB(Button, onClickEntity, entity, NULL)
        ATTRIB(Button, src, string, string_null)
@@ -53,6 +54,7 @@ float Button_keyDown(entity me, float key, float ascii, float shift)
 {
        if(key == K_ENTER || key == K_SPACE || key == K_KP_ENTER)
        {
+               me.playClickSound(me);
                me.clickTime = 0.1; // delayed for effect
                return 1;
        }
@@ -79,8 +81,7 @@ float Button_mouseRelease(entity me, vector pos)
        {
                if (!me.disabled)
                {
-                       if(cvar("menu_sounds"))
-                               localsound("sound/misc/menu2.wav");
+                       me.playClickSound(me);
                        if(me.onClick)
                                me.onClick(me, me.onClickEntity);
                }
@@ -164,4 +165,8 @@ void Button_draw(entity me)
 
        SUPER(Button).draw(me);
 }
+void Button_playClickSound(entity me)
+{
+       m_play_click_sound(MENU_SOUND_EXECUTE);
+}
 #endif

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 0a93992efa9d20c42a920c195ae299737b7cdf23..c867477f7858726e0691a1ce0aa1dcc931a4f79e 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -1012,3 +1012,9 @@ void m_play_focus_sound()
                        menuLastFocusSoundTime = time;
                }
 }
+
+void m_play_click_sound(string soundfile)
+{
+       if(cvar("menu_sounds"))
+               localsound(soundfile);
+}

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 17c4291faadaa788cf3b514d27a204f650439980..ef2cb512d01ea5226bae66a7ebbc5a660f8d8322 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -41,4 +41,7 @@ void m_sync();
 
 // sounds
 
+const string MENU_SOUND_EXECUTE = "sound/menu/execute.wav";
+
 void m_play_focus_sound();
+void m_play_click_sound(string soundfile);