From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 6 May 2010 05:27:35 +0000 (+0200)
Subject: use CHAN_VOICE
X-Git-Tag: xonotic-v0.1.0preview~640^2~19
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=6d9a7151e1b4199f98ea66934bf663b371c3baeb;p=xonotic%2Fxonotic-data.pk3dir.git

use CHAN_VOICE
---

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 952abd1bf..58649bf1f 100644
--- 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 b5782ae76..5daa3e51f 100644
--- 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 1c589eccd..68621d369 100644
--- 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);