Merge branch 'master' into Mario/buff_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_devastator.qc

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index 618c2e5358f4f4d2fd05463b85dac1a5006f6b4f..e9e0467e208ea0a9eed56642a412523adc4de74e 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -255,9 +255,9 @@ void W_Devastator_Think(void)
 
        // accelerate
        makevectors(self.angles.x * '-1 0 0' + self.angles.y * '0 1 0');
 
        // accelerate
        makevectors(self.angles.x * '-1 0 0' + self.angles.y * '0 1 0');

-       velspeed = WEP_CVAR(devastator, speed) * g_weaponspeedfactor - (self.velocity * v_forward);
+       velspeed = WEP_CVAR(devastator, speed) * W_WeaponSpeedFactor() - (self.velocity * v_forward);

        if(velspeed > 0)
        if(velspeed > 0)

-               self.velocity = self.velocity + v_forward * min(WEP_CVAR(devastator, speedaccel) * g_weaponspeedfactor * frametime, velspeed);
+               self.velocity = self.velocity + v_forward * min(WEP_CVAR(devastator, speedaccel) * W_WeaponSpeedFactor() * frametime, velspeed);

 
        // laser guided, or remote detonation
        if(self.realowner.weapon == WEP_DEVASTATOR)
 
        // laser guided, or remote detonation
        if(self.realowner.weapon == WEP_DEVASTATOR)