Merge branch 'TimePath/mutator_cleanup' into 'master'

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

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 4f072c4c085bb7e829c6355da495a14c0ad33888..d06d11cd97ad6909f25e300e7e48fe3566c78257 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -28,11 +28,9 @@
 
 float W_WeaponRateFactor()
 {
-       float t;
-       t = 1.0 / g_weaponratefactor;
+       float t = 1.0 / g_weaponratefactor;
 
-       weapon_rate = t;
-       MUTATOR_CALLHOOK(WeaponRateFactor);
+       MUTATOR_CALLHOOK(WeaponRateFactor, t);
        t = weapon_rate;
 
        return t;
@@ -40,11 +38,9 @@ float W_WeaponRateFactor()
 
 float W_WeaponSpeedFactor()
 {
-       float t;
-       t = 1.0 * g_weaponspeedfactor;
+       float t = 1.0 * g_weaponspeedfactor;
 
-       ret_float = t;
-       MUTATOR_CALLHOOK(WeaponSpeedFactor);
+       MUTATOR_CALLHOOK(WeaponSpeedFactor, t);
        t = ret_float;
 
        return t;