From 93774bce9081a9fc5eb72b30bf5fd54a9418664a Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 11 Jan 2017 04:42:12 +1000 Subject: [PATCH] Remove weapon_blocked --- qcsrc/common/mutators/mutator/overkill/sv_overkill.qc | 2 +- qcsrc/server/defs.qh | 1 - qcsrc/server/weapons/weaponsystem.qc | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 49ecb55da..5d938f3fd 100644 --- 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 43e1eb599..adfb0dbee 100644 --- 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 b36a67bfe..826bb2a5a 100644 --- 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; } -- 2.39.2