forbid weapon throwing of non-WS_READY weapons, fixes a bug

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index b5e245db6376b87373db2299c7ac259755961aa4..04b656c9a134e0daf0ee956dff64e7dd5251b753 100644 (file)
--- 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 b343862ba54250f8515ab864f10f641df50bcc1b..15898759ede6b82578b755a365ecebcda5a1cc36 100644 (file)
--- 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;