X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftuba.qc;h=38ce1090a12aea33334f64478bb69dd33bc27172;hb=71e6c75bc408ae5a116f296797c49c0cef7be113;hp=04114d324ab4b9c31590b9c9056bf15f9d71f790;hpb=730a94d1db79f35202f260884e3be8adfdd284d6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 04114d324..38ce1090a 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,6 +1,79 @@
-#define TUBA_STARTNOTE(n) strcat((checkextension("DP_SND_SETPARAMS") ? "weapons/tuba_loopnote" : "weapons/tuba_note"), ftos(n), ".wav")
-.float cnt; // note
+#define TUBA_MIN -18
+#define TUBA_MAX  27
+#define TUBA_INSTRUMENTS 3
+
+#define TUBA_STARTNOTE(i,n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
+.float note; // note
 .float attenuate; // if set, attenuate it
+.float cnt; // current volume
+.float count; // initial volume
+.float tuba_instrument;
+
+float Tuba_PitchStep;
+
+void tubasound(entity e, float restart)
+{
+	string snd1;
+
+	snd1 = string_null;
+
+	if(Tuba_PitchStep)
+	{
+		string snd2;
+		float f1, f2;
+		float p1, p2;
+		float m;
+
+		f1 = 1;
+		p1 = 1;
+		snd2 = string_null;
+		f2 = 0;
+		p2 = 1;
+
+		m = mod(e.note, Tuba_PitchStep);
+		if(m)
+		{
+			if(e.note - m < TUBA_MIN)
+			{
+				if(restart)
+					snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m + Tuba_PitchStep);
+				p1 = pow(2.0, (m - Tuba_PitchStep) / 12.0);
+			}
+			else if(e.note - m + Tuba_PitchStep > TUBA_MAX)
+			{
+				if(restart)
+					snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m);
+				p1 = pow(2.0, m / 12.0);
+			}
+			else
+			{
+				if(restart)
+					snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m);
+				f1 = cos(M_PI_2 * m / Tuba_PitchStep);
+				p1 = pow(2.0, m / 12.0);
+				if(restart)
+					snd2 = TUBA_STARTNOTE(e.tuba_instrument, e.note - m + Tuba_PitchStep);
+				f2 = sin(M_PI_2 * m / Tuba_PitchStep);
+				p2 = pow(2.0, (m - Tuba_PitchStep) / 12.0);
+			}
+		}
+		else
+		{
+			if(restart)
+				snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note);
+		}
+
+		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_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_SINGLE, snd1, e.cnt, e.attenuate * autocvar_g_balance_tuba_attenuation);
+	}
+}
 
 void Ent_TubaNote_Think()
 {
@@ -13,22 +86,27 @@ 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_SINGLE, "misc/null.wav", 0, 0);
+		if(self.enemy)
+		{
+			sound(self.enemy, CH_TUBA_SINGLE, "misc/null.wav", 0, 0);
+			remove(self.enemy);
+		}
 		remove(self);
 	}
 	else
-		sound(self, CH_SHOTS_SINGLE, "", self.cnt, self.attenuate * autocvar_g_balance_tuba_attenuation);
+	{
+		tubasound(self, 0);
+	}
 }
 
 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);
-#else
-	sound(self.enemy, CH_SHOTS_SINGLE, TUBA_STARTNOTE(self.cnt), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation);
-#endif
+	self.enemy.note = self.note;
+	self.enemy.tuba_instrument = self.tuba_instrument;
+	tubasound(self.enemy, 1);
 }
 
 void Ent_TubaNote_StopSound()
@@ -39,47 +117,83 @@ void Ent_TubaNote_StopSound()
 
 void Ent_TubaNote(float bIsNew)
 {
-	float f, n;
+	float f, n, i, att, upd;
 	f = ReadByte();
-	n = floor(f / 2) - 42;
-	if(n != self.cnt || bIsNew)
-		if(self.enemy)
-			Ent_TubaNote_StopSound();
-	if(!self.enemy)
+
+	upd = 0;
+
+	if(f & 1)
 	{
-		self.enemy = spawn();
-		self.enemy.classname = "tuba_note";
-		bIsNew = TRUE;
+		n = ReadChar();
+		i = ReadByte();
+		att = (i & 1);
+		i = floor(i / 2);
+
+		if(n != self.note || i != self.tuba_instrument || bIsNew)
+		{
+			if(self.enemy)
+				Ent_TubaNote_StopSound();
+		}
+
+		if(!self.enemy)
+		{
+			self.enemy = spawn();
+			self.enemy.classname = "tuba_note";
+			if(Tuba_PitchStep)
+			{
+				self.enemy.enemy = spawn();
+				self.enemy.enemy.classname = "tuba_note_2";
+			}
+			bIsNew = TRUE;
+		}
+
+		self.enemy.attenuate = att;
+
+		if(bIsNew)
+		{
+			self.note = n;
+			self.tuba_instrument = i;
+			upd = 1;
+		}
 	}
-	if(f & 1)
+
+	if(f & 2)
 	{
 		self.enemy.origin_x = ReadCoord();
 		self.enemy.origin_y = ReadCoord();
 		self.enemy.origin_z = ReadCoord();
 		setorigin(self.enemy, self.enemy.origin);
-		self.enemy.attenuate = ReadByte();
+		if(self.enemy.enemy)
+			setorigin(self.enemy.enemy, self.enemy.origin);
 	}
+
 	self.think = Ent_TubaNote_StopSound;
 	self.entremove = Ent_TubaNote_StopSound;
 	self.enemy.think = Ent_TubaNote_Think;
 	self.enemy.nextthink = time + 10;
-	if(bIsNew)
-	{
-		self.cnt = n;
+
+	if(upd)
 		Ent_TubaNote_UpdateSound();
-	}
 }
 
 void Tuba_Precache()
 {
-	float i;
-#ifdef PITCHSHIFT
-	precache_sound(TUBA_STARTNOTE(0));
-#else
-	for(i = -18; i <= +27; ++i)
+	float i, n;
+	Tuba_PitchStep = autocvar_g_balance_tuba_pitchstep;
+	if(Tuba_PitchStep)
+	{
+		if(!checkextension("DP_SND_SOUND7_WIP2") && !checkextension("DP_SND_SOUND7"))
+		{
+			print("^1NOTE:^7 requested pitch shifting, but not supported by this engine build\n");
+			Tuba_PitchStep = 0;
+		}
+	}
+	for(n = TUBA_MIN; n <= TUBA_MAX; ++n)
 	{
-		precache_sound(TUBA_STARTNOTE(i));
+		if(!Tuba_PitchStep || (mod(n, Tuba_PitchStep) == 0))
+		{
+			for(i = 0; i < TUBA_INSTRUMENTS; ++i)
+				precache_sound(TUBA_STARTNOTE(i, n));
+		}
 	}
-#endif
-	//precache_sound(""); // we want to change volume of existing sounds
 }