From c2bf3482cea506685317fe27502bfa855c0fad87 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 21 May 2010 10:20:13 +0200 Subject: [PATCH] forbid weapon throwing of non-WS_READY weapons, fixes a bug --- qcsrc/server/cl_weapons.qc | 2 ++ qcsrc/server/cl_weaponsystem.qc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc index b5e245db63..04b656c9a1 100644 --- a/qcsrc/server/cl_weapons.qc +++ b/qcsrc/server/cl_weapons.qc @@ -293,6 +293,8 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce) return; if(!W_IsWeaponThrowable(w)) return; + if(self.weaponentity.state != WS_READY) + return; wb = W_WeaponBit(w); if(self.weapons & wb != wb) diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index b343862ba5..15898759ed 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -34,7 +34,6 @@ float W_WeaponRateFactor() void W_SwitchWeapon_Force(entity e, float w) { - backtrace("switch"); e.cnt = e.switchweapon; e.switchweapon = w; e.selectweapon = w; -- 2.39.2