use CHAN_VOICE

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 952abd1bf0c3c0efc67cf453ed87fdfaa57bcb5b..58649bf1fa6cc7291eeefb6257f2dfb63b4d3096 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -34,7 +34,7 @@ void Net_AdvanceMusic()
                                e.state = 0;
                }
                if(e.state != s0)
-                       sound(e, CHAN_PROJECTILE, "", e.volume * e.state, ATTN_NONE);
+                       sound(e, CHAN_VOICE, "", e.volume * e.state, ATTN_NONE);
        }
        music_trigger = world;
 }
@@ -64,7 +64,7 @@ void Net_TargetMusic()
                if(e.noise)
                        strunzone(e.noise);
                e.noise = strzone(noi);
-               sound(e, CHAN_PROJECTILE, self.noise, 0, ATTN_NONE);
+               sound(e, CHAN_VOICE, self.noise, 0, ATTN_NONE);
        }
        e.volume = vol;
        e.fade_time = fai;

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index b5782ae763bcb2e9da942c8141a4b070abd93082..5daa3e51f740f00b405385cd7808ac49a7ecaa65 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -370,7 +370,7 @@ float       CHAN_VOICE                              = 2; // Voice/Radio
        // on world: UNUSED
        // on players: voice                             VOICE
        // on entities: ambient                          AMBIENT
-       // on csqc: UNUSED
+       // on csqc: background music                     BGM
 float  CHAN_TRIGGER                    = 3; // Triggers/Items
        // on world: UNUSED
        // on players: item pickup                       ITEMS

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 1c589eccd175a59b6a87c57037c7b832f046b3c1..68621d3698b2ef0c4ea0bcc26299a39311731876 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -24,6 +24,7 @@ void fillXonoticAudioSettingsTab(entity me)
 
        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:"));
                me.TD(me, 1, 2, s);
        me.TR(me);