From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Jan 2015 04:01:19 +0000 (+1100)
Subject: Client projectiles
X-Git-Tag: xonotic-v0.8.1~133^2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=109d5e6984b86120f4a169baec2d67469f73ae65;p=xonotic%2Fxonotic-data.pk3dir.git

Client projectiles
---

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index e019b6755..fa0828442 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -11,11 +11,11 @@ void SUB_Stop()
 }
 
 .float alphamod;
-.float count; // set if clientside projectile
-.float cnt; // sound index
+.int count; // set if clientside projectile
+.int cnt; // sound index
 .float gravity;
-.float snd_looping;
-.float silent;
+.int snd_looping;
+.bool silent;
 
 void Projectile_ResetTrail(vector to)
 {
@@ -49,8 +49,8 @@ void Projectile_Draw()
 {
 	vector rot;
 	vector trailorigin;
-	float f;
-	float drawn;
+	int f;
+	bool drawn;
 	float t;
 	float a;
 
@@ -159,7 +159,7 @@ void Projectile_Draw()
 	self.drawmask = MASK_NORMAL;
 }
 
-void loopsound(entity e, float ch, string samp, float vol, float attn)
+void loopsound(entity e, int ch, string samp, float vol, float attn)
 {
 	if(self.silent)
 		return;
@@ -179,7 +179,7 @@ void Ent_RemoveProjectile()
 
 void Ent_Projectile()
 {
-	float f;
+	int f;
 
 	// projectile properties:
 	//   kind (interpolated, or clientside)
@@ -444,7 +444,7 @@ void Ent_Projectile()
 
 		if(Nade_IDFromProjectile(self.cnt) != 0)
 		{
-			float nade_type = Nade_IDFromProjectile(self.cnt);
+			int nade_type = Nade_IDFromProjectile(self.cnt);
 			self.mins = '-16 -16 -16';
 			self.maxs = '16 16 16';
 			self.colormod = Nade_Color(nade_type);
diff --git a/qcsrc/client/weapons/projectile.qh b/qcsrc/client/weapons/projectile.qh
index 70c8ba0df..bd3e8f63b 100644
--- a/qcsrc/client/weapons/projectile.qh
+++ b/qcsrc/client/weapons/projectile.qh
@@ -1,3 +1,3 @@
-.float traileffect;
+.int traileffect;
 void Projectile_ResetTrail(vector to);
 void Projectile_DrawTrail(vector to);