X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fweapons%2Fprojectile.qc;h=067c0badb7da09a184c192daf1841d47c782da81;hb=b9998b31fc75c66b601e66241350b10ca694809f;hp=444fb27431136a3c6540830276987daba1a474f7;hpb=16bb4a51347c40ae0655bba054bc7cf201538e45;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 444fb2743..067c0badb 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -11,6 +11,8 @@
 #include <common/net_linked.qh>
 #include <common/physics/movetypes/movetypes.qh>
 
+#include <common/mutators/mutator/nades/nades.qh>
+
 #include <lib/csqcmodel/interpolate.qh>
 
 #include <lib/warpzone/anglestransform.qh>
@@ -50,8 +52,6 @@ void Projectile_DrawTrail(entity this, vector to)
 	}
 }
 
-bool Projectile_isnade(int proj); // TODO: remove
-
 void Projectile_Draw(entity this)
 {
 	vector rot;
@@ -171,7 +171,7 @@ void Projectile_Draw(entity this)
 
 void loopsound(entity e, int ch, Sound samp, float vol, float attn)
 {
-    TC(int, ch);
+	TC(int, ch);
 	if (e.silent)
 		return;
 
@@ -265,19 +265,19 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
 			this.fade_rate = 0;
 		}
 
-		int myteam = ReadByte();
-		this.team = myteam - 1;
+		int proj_team = ReadByte();
+		this.team = proj_team - 1;
 
 		if(teamplay)
 		{
-			if(myteam)
+			if(proj_team)
 				this.colormap = (this.team) * 0x11; // note: team - 1 on server (client uses different numbers)
 			else
 				this.colormap = 0x00;
 			this.colormap |= BIT(10); // RENDER_COLORMAPPED
 		}
 		else
-			this.colormap = myteam;
+			this.colormap = proj_team;
 		// TODO: projectiles use glowmaps for their color, not teams
 		#if 0
 		if(this.colormap > 0)