From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 22 Oct 2014 09:43:37 +0000 (+0200)
Subject: Rename CH_TUBA to CH_TUBA_SINGLE. It already was a single-channel.
X-Git-Tag: xonotic-v0.8.0~175
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88b0cf7408fd0a4291972b55d8c4be6c10e71e12;p=xonotic%2Fxonotic-data.pk3dir.git

Rename CH_TUBA to CH_TUBA_SINGLE. It already was a single-channel.
---

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index a22347fe3..38ce1090a 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -63,15 +63,15 @@ void tubasound(entity e, float restart)
 				snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note);
 		}
 
-		sound7(e, CH_TUBA, snd1, e.cnt * f1, e.attenuate * autocvar_g_balance_tuba_attenuation, 100 * p1, 0);
+		sound7(e, CH_TUBA_SINGLE, snd1, e.cnt * f1, e.attenuate * autocvar_g_balance_tuba_attenuation, 100 * p1, 0);
 		if(f2)
-			sound7(e.enemy, CH_TUBA, snd2, e.cnt * f2, e.attenuate * autocvar_g_balance_tuba_attenuation, 100 * p2, 0);
+			sound7(e.enemy, CH_TUBA_SINGLE, snd2, e.cnt * f2, e.attenuate * autocvar_g_balance_tuba_attenuation, 100 * p2, 0);
 	}
 	else
 	{
 		if(restart)
 			snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note);
-		sound(e, CH_TUBA, snd1, e.cnt, e.attenuate * autocvar_g_balance_tuba_attenuation);
+		sound(e, CH_TUBA_SINGLE, snd1, e.cnt, e.attenuate * autocvar_g_balance_tuba_attenuation);
 	}
 }
 
@@ -86,10 +86,10 @@ void Ent_TubaNote_Think()
 	self.nextthink = time;
 	if(self.cnt <= 0)
 	{
-		sound(self, CH_TUBA, "misc/null.wav", 0, 0);
+		sound(self, CH_TUBA_SINGLE, "misc/null.wav", 0, 0);
 		if(self.enemy)
 		{
-			sound(self.enemy, CH_TUBA, "misc/null.wav", 0, 0);
+			sound(self.enemy, CH_TUBA_SINGLE, "misc/null.wav", 0, 0);
 			remove(self.enemy);
 		}
 		remove(self);
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index fc0dd9a4d..bf312e3ad 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -295,7 +295,7 @@ const float CH_PAIN = -6;
 const float CH_PAIN_SINGLE = 6;
 const float CH_PLAYER = -7;
 const float CH_PLAYER_SINGLE = 7;
-const float CH_TUBA = 5;
+const float CH_TUBA_SINGLE = 5;
 
 const float ATTEN_NONE = 0;
 const float ATTEN_MIN = 0.015625;