Merge branch 'martin-t/dmgtext' 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 847f3db49d3f298945d16e3ba29250630bceef9b..a6ae463477d51162d7364c55e35a4646d1ce20a5 100644 (file)
--- a/qcsrc/client/weapons/projectile.qh
+++ b/qcsrc/client/weapons/projectile.qh
@@ -1,5 +1,6 @@
-#ifndef CLIENT_WEAPONS_PROJECTILE_H
-#define CLIENT_WEAPONS_PROJECTILE_H
+#pragma once
+
+#include <common/sounds/sound.qh>
 
 entityclass(Projectile);
 class(Projectile).int traileffect;
@@ -17,7 +18,7 @@ class(Projectile).float gravity;
 class(Projectile).int snd_looping;
 class(Projectile).bool silent;
 
-void SUB_Stop();
+void SUB_Stop(entity this, entity toucher);
 
 void Projectile_ResetTrail(entity this, vector to);
 
@@ -25,12 +26,8 @@ void Projectile_DrawTrail(entity this, vector to);
 
 void Projectile_Draw(entity this);
 
-void loopsound(entity e, int ch, string samp, float vol, float attn);
-
-void Ent_RemoveProjectile();
-
-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);