Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_violence.qh

diff --git a/qcsrc/server/g_violence.qh b/qcsrc/server/g_violence.qh
index 1f1df0683a7bfd8ca66b56bc46eb148bcff3bf2b..98d2b811fcd2858cec93686b65fd3e35da9fd7ea 100644 (file)
--- a/qcsrc/server/g_violence.qh
+++ b/qcsrc/server/g_violence.qh
@@ -1,7 +1,7 @@
 #ifndef G_VIOLENCE_H
 #define G_VIOLENCE_H
 
-float Violence_GibSplash_SendEntity(entity to, float sf);
+float Violence_GibSplash_SendEntity(entity to, int sf);
 
 // TODO maybe convert this to a TE?
 void Violence_GibSplash_At(vector org, vector dir, float type, float amount, entity gibowner, entity attacker);