properly use bgmvolume, get rid of the volume cvar, make a new mastervolume cvar...

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 7de32b50791a29aa2106f538a8cdeb426d48de07..97faf67900d73b77b54cc69b99949c656cbdb133 100644 (file)
--- 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 68621d3698b2ef0c4ea0bcc26299a39311731876..7c3c754d4cce746dbb49ad9acf44c44ec8814fa4 100644 (file)
--- 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);