Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_weapons.qc

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 4ab7abde4b200cf0bf122f2ef955408018ddc4d4..540e3f84acbba076156d31ddbe8cb20f54a6339f 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -293,7 +293,7 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
                return;
        if(!W_IsWeaponThrowable(w))
                return;
-       if(self.weaponentity.state != WS_READY)
+       if(self.deadflag == DEAD_NO && self.weaponentity.state != WS_READY)
                return;
 
        wb = W_WeaponBit(w);
@@ -385,7 +385,7 @@ void W_WeaponFrame()
        // server framerate is very low and the weapon fire rate very high
        local float c;
        c = 0;
-       while (c < 5)
+       while (c < W_TICSPERFRAME)
        {
                c = c + 1;
                if(wb && ((self.weapons & wb) == 0))