X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftuba.qc;h=dec00043f9baf0300382d7867f0476a15ebf28c6;hb=dc647e251ac9cce3239475da19cf24cfdd24bc56;hp=38ce1090a12aea33334f64478bb69dd33bc27172;hpb=616d99d79237801b1764601653995b3afc88448a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 38ce1090a..dec00043f 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,15 +1,4 @@
-#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;
+#include "tuba.qh"
 
 void tubasound(entity e, float restart)
 {
@@ -30,7 +19,7 @@ void tubasound(entity e, float restart)
 		f2 = 0;
 		p2 = 1;
 
-		m = mod(e.note, Tuba_PitchStep);
+		m = e.note % Tuba_PitchStep;
 		if(m)
 		{
 			if(e.note - m < TUBA_MIN)
@@ -117,7 +106,8 @@ void Ent_TubaNote_StopSound()
 
 void Ent_TubaNote(float bIsNew)
 {
-	float f, n, i, att, upd;
+    int f, n, i;
+	float att, upd;
 	f = ReadByte();
 
 	upd = 0;
@@ -144,7 +134,7 @@ void Ent_TubaNote(float bIsNew)
 				self.enemy.enemy = spawn();
 				self.enemy.enemy.classname = "tuba_note_2";
 			}
-			bIsNew = TRUE;
+			bIsNew = true;
 		}
 
 		self.enemy.attenuate = att;
@@ -178,7 +168,8 @@ void Ent_TubaNote(float bIsNew)
 
 void Tuba_Precache()
 {
-	float i, n;
+	float i;
+    int n;
 	Tuba_PitchStep = autocvar_g_balance_tuba_pitchstep;
 	if(Tuba_PitchStep)
 	{
@@ -190,7 +181,7 @@ void Tuba_Precache()
 	}
 	for(n = TUBA_MIN; n <= TUBA_MAX; ++n)
 	{
-		if(!Tuba_PitchStep || (mod(n, Tuba_PitchStep) == 0))
+		if(!Tuba_PitchStep || ((n % Tuba_PitchStep) == 0))
 		{
 			for(i = 0; i < TUBA_INSTRUMENTS; ++i)
 				precache_sound(TUBA_STARTNOTE(i, n));