Merge branch 'master' into martin-t/globals

[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 67e08c224bfd6f2a5f35dd8f3354c36e7d79be07..eaa80d05f0a6ae2b9b6d5ebefb0c6041473b6488 100644 (file)
--- a/qcsrc/client/weapons/projectile.qh
+++ b/qcsrc/client/weapons/projectile.qh
@@ -1,36 +1,33 @@
-#ifndef PROJECTILE_H
-#define PROJECTILE_H
+#pragma once
 
-entityclass(Projectile);
-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;
+#include <common/sounds/sound.qh>
 
-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;
+entityclass(Projectile);
+classfield(Projectile).int traileffect;
 
-void SUB_Stop();
+classfield(Projectile).vector iorigin1, iorigin2;
+classfield(Projectile).float spawntime;
+classfield(Projectile).vector trail_oldorigin;
+classfield(Projectile).float trail_oldtime;
+classfield(Projectile).float fade_time, fade_rate;
 
-void Projectile_ResetTrail(vector to);
+classfield(Projectile).float alphamod;
+classfield(Projectile).int count; // set if clientside projectile
+classfield(Projectile).int cnt;   // sound index
+classfield(Projectile).float gravity;
+classfield(Projectile).int snd_looping;
+classfield(Projectile).bool silent;
 
-void Projectile_DrawTrail(vector to);
+void SUB_Stop(entity this, entity toucher);
 
-void Projectile_Draw();
+void Projectile_ResetTrail(entity this, vector to);
 
-void loopsound(entity e, int ch, string samp, float vol, float attn);
+void Projectile_DrawTrail(entity this, vector to);
 
-void Ent_RemoveProjectile();
+void Projectile_Draw(entity this);
 
-void Ent_Projectile();
+void loopsound(entity e, int ch, Sound samp, float vol, float attn);
 
-void Projectile_Precache();
+void Ent_RemoveProjectile(entity this);
 
-#endif
+const int FL_PROJECTILE = BIT(15);