Remove weapon_blocked

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 49ecb55da135e7494874179ca5baac63b3c418e0..5d938f3fd03883d6ee66f55c5c63631bfd233cf3 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -119,7 +119,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
                return;
 
        if(PHYS_INPUT_BUTTON_ATCK2(player))
-       if( !forbidWeaponUse(player) || player.weapon_blocked // allow if weapon is reloading
+       if( !forbidWeaponUse(player)
                || (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
        if(time >= player.jump_interval)
        {

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 43e1eb59993aa93bc28f4a5275d8a527c9bbc400..adfb0dbee743cd765278697df28ca3877f24e1b7 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -377,7 +377,6 @@ const float ACTIVE_TOGGLE   = 3;
 .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator
 
 .float player_blocked;
-.float weapon_blocked; // weapon use disabled
 
 .float revive_progress = _STAT(REVIVE_PROGRESS);
 .float revival_time; // time at which player was last revived

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index b36a67bfe699bdd81a4e5904670596bf3b21d66c..826bb2a5a7f8415ce2f41487d17ec2da56552a89 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -421,7 +421,6 @@ bool forbidWeaponUse(entity player)
        if (player.player_blocked) return true;
        if (game_stopped) return true;
        if (STAT(FROZEN, player)) return true;
-       if (player.weapon_blocked) return true;
        if (MUTATOR_CALLHOOK(ForbidWeaponUse, player)) return true;
        return false;
 }