From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 23 Sep 2011 13:20:23 +0000 (+0200)
Subject: give the tuba its own audio channel
X-Git-Tag: xonotic-v0.6.0~40^2~116
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e05e6a03d0527401721106acfb00b3eef8ff3b25;p=xonotic%2Fxonotic-data.pk3dir.git

give the tuba its own audio channel
---

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 04114d324..c2b031a11 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -13,11 +13,11 @@ void Ent_TubaNote_Think()
 	self.nextthink = time;
 	if(self.cnt <= 0)
 	{
-		sound(self, CH_SHOTS_SINGLE, "misc/null.wav", 0, 0);
+		sound(self, CH_TUBA, "misc/null.wav", 0, 0);
 		remove(self);
 	}
 	else
-		sound(self, CH_SHOTS_SINGLE, "", self.cnt, self.attenuate * autocvar_g_balance_tuba_attenuation);
+		sound(self, CH_TUBA, "", self.cnt, self.attenuate * autocvar_g_balance_tuba_attenuation);
 }
 
 void Ent_TubaNote_UpdateSound()
@@ -25,9 +25,9 @@ void Ent_TubaNote_UpdateSound()
 	self.enemy.cnt = bound(0, VOL_BASE * autocvar_g_balance_tuba_volume, 1);
 	self.enemy.count = self.enemy.cnt;
 #ifdef PITCHSHIFT
-	sound7(self.enemy, CH_SHOTS_SINGLE, TUBA_STARTNOTE(0), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation, 100 * pow(2.0, self.cnt / 12.0), 0);
+	sound7(self.enemy, CH_TUBA, TUBA_STARTNOTE(0), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation, 100 * pow(2.0, self.cnt / 12.0), 0);
 #else
-	sound(self.enemy, CH_SHOTS_SINGLE, TUBA_STARTNOTE(self.cnt), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation);
+	sound(self.enemy, CH_TUBA, TUBA_STARTNOTE(self.cnt), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation);
 #endif
 }
 
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index fe5f9bcd2..ebad7a6f0 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -442,6 +442,7 @@ float CH_WEAPON_B = 5; // only on players and entities
 float CH_PAIN = 6; // only on players and csqc
 float CH_PAIN_SINGLE = 6; // only on players and csqc
 float CH_PLAYER = 7; // only on players and entities
+float CH_TUBA = 5; // only on csqc
 #else
 float CH_INFO = 0;
 float CH_TRIGGER = -3;
@@ -457,6 +458,7 @@ float CH_WEAPON_B = -1;
 float CH_PAIN = -6;
 float CH_PAIN_SINGLE = 6;
 float CH_PLAYER = -7;
+float CH_TUBA = 5;
 #endif
 
 float	ATTN_NONE				= 0;
diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 69d6af6b0..f85c2877c 100644
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -87,7 +87,7 @@ void XonoticAudioSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel1volume");
-		makeMulti(s, "snd_channel5volume"); // legacy
+		makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");