Merge branch 'maint'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / tracing.qc

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 2a3181d1b2d3987ccf529a964038db1039214035..98cbb2ba872a10794dc057693612c108163ec23e 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -12,7 +12,7 @@
 #include "../../common/constants.qh"
 #include "../../common/util.qh"
 
-#include "../../common/weapons/weapons.qh"
+#include "../../common/weapons/all.qh"
 
 #include "../../warpzonelib/common.qh"
 
@@ -148,7 +148,7 @@ vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float f
        float mspeed;
        vector outvelocity;
 
-       mvelocity = mvelocity * g_weaponspeedfactor;
+       mvelocity = mvelocity * W_WeaponSpeedFactor();
 
        mdirection = normalize(mvelocity);
        mspeed = vlen(mvelocity);