Merge branch 'martin-t/cvar-prefixes' into 'master'

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

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index 9b1e38e8e376c381f096b3c6c0f07527a30d5682..2320eb830ef50db38913df89c96a724ce801080d 100644 (file)
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -334,7 +334,7 @@ IMPULSE(weapon_reload)
 {
        if (this.vehicle) return;
        if (IS_DEAD(this)) return;
-       if (forbidWeaponUse(this)) return;
+       if (weaponLocked(this)) return;
        entity actor = this;
        for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
        {