X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftuba.qc;h=38ce1090a12aea33334f64478bb69dd33bc27172;hb=31bf64ba7821ebb5c0aba8a154472810074ed11e;hp=6e1c1f9bd78b2ab3480a1054020fbec475edbc86;hpb=46efdcf8bf523f3e1fd9a7850204f4fec661d724;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 6e1c1f9bd..38ce1090a 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,6 +1,6 @@
 #define TUBA_MIN -18
 #define TUBA_MAX  27
-#define TUBA_INSTRUMENTS 1
+#define TUBA_INSTRUMENTS 3
 
 #define TUBA_STARTNOTE(i,n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
 .float note; // note
@@ -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);
@@ -117,9 +117,11 @@ void Ent_TubaNote_StopSound()
 
 void Ent_TubaNote(float bIsNew)
 {
-	float f, n, i, att;
+	float f, n, i, att, upd;
 	f = ReadByte();
 
+	upd = 0;
+
 	if(f & 1)
 	{
 		n = ReadChar();
@@ -151,7 +153,7 @@ void Ent_TubaNote(float bIsNew)
 		{
 			self.note = n;
 			self.tuba_instrument = i;
-			Ent_TubaNote_UpdateSound();
+			upd = 1;
 		}
 	}
 
@@ -169,6 +171,9 @@ void Ent_TubaNote(float bIsNew)
 	self.entremove = Ent_TubaNote_StopSound;
 	self.enemy.think = Ent_TubaNote_Think;
 	self.enemy.nextthink = time + 10;
+
+	if(upd)
+		Ent_TubaNote_UpdateSound();
 }
 
 void Tuba_Precache()