[nexuiz-commits] r8433 - in trunk/data: . qcsrc/menu/item qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: samual
Date: 2009-12-20 00:09:05 -0500 (Sun, 20 Dec 2009)
New Revision: 8433

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/item/button.c
   trunk/data/qcsrc/menu/item/slider.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
   trunk/data/tooltips.db
Log:
Patch #589: Menu sounds, disabled by default. (patch by Taoki)

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-20 04:38:50 UTC (rev 8432)
+++ trunk/data/defaultNexuiz.cfg	2009-12-20 05:09:05 UTC (rev 8433)
@@ -1281,6 +1281,7 @@
 
 seta menu_skin "wickedz"
 set menu_slowmo 1
+seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 
 // loadfont console     gfx/vera-mono
 // loadfont sbar        gfx/vera-mono
@@ -1756,4 +1757,4 @@
 set r_showbboxes 0
 
 // we REALLY need the end pos nudging DP bug workaround for trace-to-end-of-solid to work
-collision_endposnudge 1
+collision_endposnudge 1
\ No newline at end of file

Modified: trunk/data/qcsrc/menu/item/button.c
===================================================================
--- trunk/data/qcsrc/menu/item/button.c	2009-12-20 04:38:50 UTC (rev 8432)
+++ trunk/data/qcsrc/menu/item/button.c	2009-12-20 05:09:05 UTC (rev 8433)
@@ -69,6 +69,8 @@
 float mousePressButton(entity me, vector pos)
 {
 	me.mouseDrag(me, pos); // verify coordinates
+	if(cvar("menu_sounds"))
+		localsound("sound/misc/menu2.wav");
 	return 1;
 }
 float mouseReleaseButton(entity me, vector pos)
@@ -86,6 +88,7 @@
 {
 	me.focusable = !me.disabled;
 }
+.float playedfocus;
 void drawButton(entity me)
 {
 	vector bOrigin, bSize;
@@ -156,5 +159,14 @@
 			me.onClick(me, me.onClickEntity);
 	}
 	me.clickTime -= frametime;
+
+	if(cvar("menu_sounds") > 1)
+		if(me.focused && !me.playedfocus)
+		{
+			localsound("sound/misc/menu1.wav");
+			me.playedfocus = 1;
+		}
+		else if(!me.focused && me.playedfocus)
+			me.playedfocus = 0;
 }
-#endif
+#endif
\ No newline at end of file

Modified: trunk/data/qcsrc/menu/item/slider.c
===================================================================
--- trunk/data/qcsrc/menu/item/slider.c	2009-12-20 04:38:50 UTC (rev 8432)
+++ trunk/data/qcsrc/menu/item/slider.c	2009-12-20 05:09:05 UTC (rev 8433)
@@ -212,6 +212,8 @@
 			//me.mouseDrag(me, pos);
 		}
 	}
+	if(cvar("menu_sounds"))
+		localsound("sound/misc/menu2.wav");
 	return 1;
 }
 float mouseReleaseSlider(entity me, vector pos)
@@ -251,4 +253,4 @@
 	drawLabel(me);
 	me.text = string_null; // TEMPSTRING!
 }
-#endif
+#endif
\ No newline at end of file

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-12-20 04:38:50 UTC (rev 8432)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-12-20 05:09:05 UTC (rev 8433)
@@ -94,6 +94,7 @@
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
+	me.TR(me);
 
 	me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Frequency:"));
@@ -166,8 +167,10 @@
 			e.configureNexuizTextSliderValues(e);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_hitsound", "Hit indicator"));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(2, 0, "menu_sounds", "Menu sounds"));
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart; sendcvar cl_hitsound; sendcvar cl_autotaunt; sendcvar cl_voice_directional; sendcvar cl_voice_directional_taunt_attenuation", COMMANDBUTTON_APPLY));
 }
-#endif
+#endif
\ No newline at end of file

Modified: trunk/data/tooltips.db
===================================================================
--- trunk/data/tooltips.db	2009-12-20 04:38:50 UTC (rev 8432)
+++ trunk/data/tooltips.db	2009-12-20 05:09:05 UTC (rev 8433)
@@ -175,6 +175,7 @@
 \cl_autotaunt\Automatically taunt enemies after fragging them
 \cl_sound_maptime_warning\Announcer sound telling you the remaining minutes of the match
 \cl_hitsound\Play a hit indicator sound when your shot hits an enemy
+\menu_sounds\Play sounds when clicking or hovering over menu items
 
 \NexuizSettingsDialog/Network\Network settings
 \cl_movement\Enable clientside movement prediction