From 1e41ea628a3ae09c4c2341b2ba72924c1ff01bde Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 6 May 2010 08:20:29 +0200 Subject: [PATCH] properly use bgmvolume, get rid of the volume cvar, make a new mastervolume cvar for this --- qcsrc/client/target_music.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_audio.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc index 7de32b507..97faf6790 100644 --- a/qcsrc/client/target_music.qc +++ b/qcsrc/client/target_music.qc @@ -35,7 +35,7 @@ void TargetMusic_Advance() } if(e.state != s0) { - sound(e, CHAN_VOICE, "", e.volume * e.state, ATTN_NONE); + sound(e, CHAN_VOICE, "", e.volume * e.state * cvar("bgmvolume"), ATTN_NONE); } } music_trigger = world; diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 68621d369..7c3c754d4 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -23,14 +23,14 @@ void fillXonoticAudioSettingsTab(entity me) entity e, s, sl; me.TR(me); - s = makeXonoticDecibelsSlider(-20, 0, 0.5, "bgmvolume"); - makeMulti(s, "snd_csqcchannel2volume"); - me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(-1000000, 1, s, "Music:")); + s = makeXonoticDecibelsSlider(-20, 0, 0.5, "mastervolume"); + me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(-1000000, 1, s, "Master:")); me.TD(me, 1, 2, s); me.TR(me); - me.TR(me); - s = makeXonoticDecibelsSlider(-20, 0, 0.5, "volume"); - me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(-1000000, 1, s, "Master:")); + me.TDempty(me, 0.2); + s = makeXonoticDecibelsSlider(-20, 0, 0.5, "bgmvolume"); + makeMulti(s, "snd_csqcchannel2volume"); + me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, "Music:")); me.TD(me, 1, 2, s); me.TR(me); me.TDempty(me, 0.2); -- 2.39.2