Remove weapon_blocked
authorMario <mario@smbclan.net>
Tue, 10 Jan 2017 18:42:12 +0000 (04:42 +1000)
committerMario <mario@smbclan.net>
Tue, 10 Jan 2017 18:42:12 +0000 (04:42 +1000)
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/defs.qh
qcsrc/server/weapons/weaponsystem.qc

index 49ecb55..5d938f3 100644 (file)
@@ -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)
        {
index 43e1eb5..adfb0db 100644 (file)
@@ -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
index b36a67b..826bb2a 100644 (file)
@@ -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;
 }