From 9b75de24f0d85127fb078fe3c8527a8b4470aedb Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 15 Feb 2013 19:19:30 +0100 Subject: [PATCH] When not playing a round stop current weapon action; also give initial weapon to players respawned on round reset --- qcsrc/server/cl_weapons.qc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc index cdc6ea36d..7e9da5b21 100644 --- a/qcsrc/server/cl_weapons.qc +++ b/qcsrc/server/cl_weapons.qc @@ -373,11 +373,18 @@ void W_WeaponFrame() if (frametime) self.weapon_frametime = frametime; + if (!self.weaponentity || self.health < 1) + return; // Dead player can't use weapons and injure impulse commands + if(time < game_starttime && !autocvar_sv_ready_restart_after_countdown) return; if(round_handler_IsActive() && !round_handler_IsRoundStarted()) + if(self.weaponentity.state != WS_CLEAR) + { + w_ready(); return; + } if(self.player_blocked) return; @@ -385,9 +392,6 @@ void W_WeaponFrame() if(self.freezetag_frozen == 1) return; - if (!self.weaponentity || self.health < 1) - return; // Dead player can't use weapons and injure impulse commands - if(!self.switchweapon) { self.weapon = 0; -- 2.39.2