From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Feb 2011 17:26:43 +0000 (+0100)
Subject: Play sound on mouse release only for enabled buttons/sliders
X-Git-Tag: xonotic-v0.5.0~309^2~11^2~14
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=1c96c4a8d388a39324c24551f869f2d1e8cc4b13;hp=39a229aee704c8de7e6df120818abbd50c57f622;p=xonotic%2Fxonotic-data.pk3dir.git

Play sound on mouse release only for enabled buttons/sliders
---

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)