X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_audio.c;h=8e80495321436beaeeeed91eca8447e5ee00cdd5;hb=28b764398ef657de83d596f7978cfe755299fbeb;hp=e38a87be66211eb41366ed773f891aca3d12b668;hpb=8b5335b125ddeb8a0c023ff5cf7f5f28f034f4e3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index e38a87be6..8e8049532 100644
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -4,7 +4,7 @@ CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
 	ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))
 	ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
 	ATTRIB(XonoticAudioSettingsTab, rows, float, 17)
-	ATTRIB(XonoticAudioSettingsTab, columns, float, 6.5)
+	ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space 
 ENDCLASS(XonoticAudioSettingsTab)
 entity makeXonoticAudioSettingsTab();
 #endif
@@ -25,81 +25,100 @@ void XonoticAudioSettingsTab_fill(entity me)
 	me.TR(me);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "mastervolume");
 		me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Master:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "bgmvolume");
-		makeMulti(s, "snd_csqcchannel2volume");
+		makeMulti(s, "snd_channel8volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Music:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
+		makeMulti(s, "snd_channel9volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, ZCTX(_("VOL^Ambient:"))));
-		makeMulti(s, "snd_entchannel2volume");
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_worldchannel0volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel0volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Info:")));
-		makeMulti(s, "snd_csqcchannel0volume");
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_entchannel3volume");
-		makeMulti(s, "snd_playerchannel0volume snd_playerchannel3volume snd_csqcchannel3volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel3volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Items:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel6volume");
-		makeMulti(s, "snd_csqcchannel6volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel6volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Pain:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel7volume");
-		makeMulti(s, "snd_entchannel7volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel7volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Player:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_entchannel4volume");
-		makeMulti(s, "snd_playerchannel4volume snd_entchannel6volume snd_csqcchannel4volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel4volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Shots:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel2volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel2volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Voice:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel1volume");
-		makeMulti(s, "snd_playerchannel5volume snd_entchannel1volume snd_entchannel5volume");
+		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel1volume");
+		makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
+		if(s.value != e.savedValue)
+			e.savedValue = 0; // default
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
-
-	me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "menu_snd_attenuation_method", _("New style sound attenuation")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "snd_mutewhenidle", _("Mute sounds when not active")));
+	
+	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Frequency:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("snd_speed"));
 			e.addValue(e, _("8 kHz"), "8000");
@@ -124,15 +143,12 @@ void XonoticAudioSettingsTab_fill(entity me)
 			e.addValue(e, _("7.1"), "8");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap Stereo")));
+		me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap Stereo")));
 		setDependent(e, "snd_channels", 1.5, 0.5);
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode")));
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode")));
 		setDependent(e, "snd_channels", 1.5, 0.5);
 	me.TR(me);
-	me.TR(me);
+	/*me.TR(me); // Samual: I REALLY don't think these are relevant to anyone, and just clutter up the menu pointlessly. The defaults are fine.
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Spatial voices:")));
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "0", ZCTX(_("VOCS^None"))));
 		me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "2", ZCTX(_("VOCS^Taunts"))));
@@ -149,6 +165,23 @@ void XonoticAudioSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("RNG^Full")), "0.015625");
 			e.configureXonoticTextSliderValues(e);
 		setDependent(e, "cl_voice_directional", 0.5, -0.5);
+	me.TR(me);*/
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_hitsound", _("Hit indication sound")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", _("Chat message sound")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 0, "menu_sounds", _("Menu sounds")));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Time announcer:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_announcer_maptime"));
+			e.addValue(e, ZCTX(_("WRN^Disabled")), "0");
+			e.addValue(e, _("1 minute"), "1");
+			e.addValue(e, _("5 minutes"), "2");
+			e.addValue(e, ZCTX(_("WRN^Both")), "3");
+			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
 	me.TR(me);
 		sl = makeXonoticSlider(0.15, 1, 0.05, "cl_autotaunt");
 			sl.valueDisplayMultiplier = 100;
@@ -162,19 +195,11 @@ void XonoticAudioSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, sl);
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Time warning:")));
-		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_sound_maptime_warning"));
-			e.addValue(e, ZCTX(_("WRN^None")), "0");
-			e.addValue(e, _("1 minute"), "1");
-			e.addValue(e, _("5 minutes"), "2");
-			e.addValue(e, ZCTX(_("WRN^Both")), "3");
-			e.configureXonoticTextSliderValues(e);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_hitsound", _("Hit indicator")));
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 0, "menu_sounds", _("Menu sounds")));
+		if(cvar("developer"))
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showsound", _("Debug info about sounds")));
+	
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("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));
+		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "snd_restart; snd_attenuation_method_$menu_snd_attenuation_method; sendcvar cl_hitsound; sendcvar cl_autotaunt; sendcvar cl_voice_directional; sendcvar cl_voice_directional_taunt_attenuation", COMMANDBUTTON_APPLY));
 }
 #endif