From 81f9b2a14f4c2f9b5ec647fdec857d5e4ba05f10 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 21 Jun 2013 19:56:32 +0200 Subject: [PATCH] set value steps to 0.1 and 1; menu_snd_sliderstep now is 2 (0..10 scale) --- defaultXonotic.cfg | 2 +- qcsrc/menu/xonotic/dialog_settings_audio.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 32ecdccbe..2437360c4 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1533,7 +1533,7 @@ set snd_soundradius 1200 set snd_softclip 1 set snd_maxchannelvolume 0 set snd_streaming_length 2 -seta menu_snd_sliderscale 0 "0: decibels; 1: linear percent; 2: 0..10 scale; 3: slider size percent" +seta menu_snd_sliderscale 2 "0: decibels; 1: linear percent; 2: 0..10 scale; 3: slider size percent" seta menu_snd_attenuation_method 1 "Use exponential instead of linear falloff for sound attenuation" alias snd_attenuation_method_0 "set menu_snd_attenuation_method 0; set snd_soundradius 1200; set snd_attenuation_exponent 1; set snd_attenuation_decibel 0" // Quake default alias snd_attenuation_method_1 "set menu_snd_attenuation_method 1; set snd_soundradius 2400; set snd_attenuation_exponent 4; set snd_attenuation_decibel 0" // nice approximation for method 2 diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 2fe175feb..d60863df2 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -23,12 +23,13 @@ void XonoticAudioSettingsTab_fill(entity me) entity e, s, sl; me.TR(me); - s = makeXonoticDecibelsSlider(-40, 0, 1, "mastervolume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "mastervolume"); + s. me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Master:"))); me.TD(me, 1, 2, s); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "bgmvolume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "bgmvolume"); makeMulti(s, "snd_channel8volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Music:"))); me.TD(me, 1, 2, s); @@ -36,7 +37,7 @@ void XonoticAudioSettingsTab_fill(entity me) setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_staticvolume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_staticvolume"); makeMulti(s, "snd_channel9volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VOL^Ambient:")))); me.TD(me, 1, 2, s); @@ -44,49 +45,49 @@ void XonoticAudioSettingsTab_fill(entity me) setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel0volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel0volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Info:"))); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel3volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel3volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Items:"))); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel6volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel6volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Pain:"))); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel7volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel7volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Player:"))); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel4volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel4volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Shots:"))); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel2volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel2volume"); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Voice:"))); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); setDependentStringNotEqual(s, "mastervolume", "0"); me.TR(me); me.TDempty(me, 0.2); - s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel1volume"); + s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel1volume"); makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Weapons:"))); me.TD(me, 1, 2, s); -- 2.39.2