From 1c96c4a8d388a39324c24551f869f2d1e8cc4b13 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 20 Feb 2011 18:26:43 +0100 Subject: [PATCH 1/1] Play sound on mouse release only for enabled buttons/sliders --- qcsrc/menu/item/button.c | 6 ++++-- qcsrc/menu/item/slider.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qcsrc/menu/item/button.c b/qcsrc/menu/item/button.c index 527672d25..71ca11c7c 100644 --- a/qcsrc/menu/item/button.c +++ b/qcsrc/menu/item/button.c @@ -74,13 +74,15 @@ float Button_mousePress(entity me, vector pos) } float Button_mouseRelease(entity me, vector pos) { - if(cvar("menu_sounds")) - localsound("sound/misc/menu2.wav"); me.mouseDrag(me, pos); // verify coordinates if(me.pressed) { if not(me.disabled) + { + if(cvar("menu_sounds")) + localsound("sound/misc/menu2.wav"); me.onClick(me, me.onClickEntity); + } me.pressed = 0; } return 1; diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c index 927e07f67..3421fafa4 100644 --- a/qcsrc/menu/item/slider.c +++ b/qcsrc/menu/item/slider.c @@ -240,11 +240,11 @@ float Slider_mousePress(entity me, vector pos) } float Slider_mouseRelease(entity me, vector pos) { - if(cvar("menu_sounds")) - localsound("sound/misc/menu2.wav"); me.pressed = 0; if(me.disabled) return 0; + if(cvar("menu_sounds")) + localsound("sound/misc/menu2.wav"); return 1; } void Slider_showNotify(entity me) -- 2.39.2