Merge branch 'terencehill/weaponmodel_effects_improvements' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / weapons / projectile.qh

diff --git a/qcsrc/client/weapons/projectile.qh b/qcsrc/client/weapons/projectile.qh
index 5a0deb4990d20af00bf47f54f265e7f4c562976d..1b0d313aa9cc9cea10a3c1d38d8e34790fa2d2f8 100644 (file)
--- a/qcsrc/client/weapons/projectile.qh
+++ b/qcsrc/client/weapons/projectile.qh
@@ -2,22 +2,22 @@
 #define CLIENT_WEAPONS_PROJECTILE_H
 
 entityclass(Projectile);
-class(Projectile) .int traileffect;
+class(Projectile).int traileffect;
 
-class(Projectile) .vector iorigin1, iorigin2;
-class(Projectile) .float spawntime;
-class(Projectile) .vector trail_oldorigin;
-class(Projectile) .float trail_oldtime;
-class(Projectile) .float fade_time, fade_rate;
+class(Projectile).vector iorigin1, iorigin2;
+class(Projectile).float spawntime;
+class(Projectile).vector trail_oldorigin;
+class(Projectile).float trail_oldtime;
+class(Projectile).float fade_time, fade_rate;
 
-class(Projectile) .float alphamod;
-class(Projectile) .int count; // set if clientside projectile
-class(Projectile) .int cnt; // sound index
-class(Projectile) .float gravity;
-class(Projectile) .int snd_looping;
-class(Projectile) .bool silent;
+class(Projectile).float alphamod;
+class(Projectile).int count; // set if clientside projectile
+class(Projectile).int cnt;   // sound index
+class(Projectile).float gravity;
+class(Projectile).int snd_looping;
+class(Projectile).bool silent;
 
-void SUB_Stop();
+void SUB_Stop(entity this);
 
 void Projectile_ResetTrail(entity this, vector to);
 
@@ -27,10 +27,8 @@ void Projectile_Draw(entity this);
 
 void loopsound(entity e, int ch, string samp, float vol, float attn);
 
-void Ent_RemoveProjectile();
+void Ent_RemoveProjectile(entity this);
 
-void Ent_Projectile();
-
-void Projectile_Precache();
+const int FL_PROJECTILE = BIT(15);
 
 #endif