Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / util.qc

diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc
index 3d6d95a76a42504e5dda204de447114867890ea1..477df7b6808a4ef80eefa7bf08544ac71290a539 100644 (file)
--- a/qcsrc/common/turrets/util.qc
+++ b/qcsrc/common/turrets/util.qc
@@ -132,7 +132,7 @@ float turret_tag_fire_update()
 * Railgun-like beam, but has thickness and suppots slowing of target
 */
 void FireImoBeam (vector start, vector end, vector smin, vector smax,
-                                 float bforce, float f_dmg, float f_velfactor, float deathtype)
+                                 float bforce, float f_dmg, float f_velfactor, int deathtype)
 
 {
        vector hitloc, force, endpoint, dir;