From 7b7fbeb6cf0cc250729b942254b7acb91c0dc690 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Thu, 26 May 2011 03:14:25 +0300 Subject: [PATCH] disallow crouching + melee attack, this prevents exploit where melee animation is not visible, plus crouching + massive melee swing wouldnt make much sense anyway :) --- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/w_shotgun.qc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index ffeba55eb..18ec6f9ca 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2817,7 +2817,7 @@ void PlayerPreThink (void) self.prevorigin = self.origin; - if ((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) + if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != 23) // prevent crouching if using melee attack { if (!self.crouch) { diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 635b1ccf8..f9bcc251f 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -132,6 +132,7 @@ float w_shotgun(float req) } } if (self.clip_load >= 0) // we are not currently reloading + if (!self.crouch) // we are not currently crouching; this fixes an exploit where your melee anim is not visible, and besides wouldn't make much sense if (self.BUTTON_ATCK2 && autocvar_g_balance_shotgun_secondary) if (weapon_prepareattack(1, autocvar_g_balance_shotgun_secondary_refire)) { -- 2.39.2