X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=477b641ba7e61d21ba7d28989827ccbe20a5ef8a;hb=f5a4528333fce47088f426c7fe76e1b913202860;hp=4ab7abde4b200cf0bf122f2ef955408018ddc4d4;hpb=61538042b04bc6b8415276fcd0ef7723c02bd32c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 4ab7abde4..477b641ba 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -123,7 +123,7 @@ void W_NextWeapon(float list)
 	if(list == 0)
 		W_CycleWeapon(weaponorder_byid, -1);
 	else if(list == 1)
-		W_CycleWeapon(weaponorder_byimpulse, -1);
+		W_CycleWeapon(self.weaponorder_byimpulse, -1);
 	else if(list == 2)
 		W_CycleWeapon(self.cvar_cl_weaponpriority, -1);
 }
@@ -134,23 +134,11 @@ void W_PreviousWeapon(float list)
 	if(list == 0)
 		W_CycleWeapon(weaponorder_byid, +1);
 	else if(list == 1)
-		W_CycleWeapon(weaponorder_byimpulse, +1);
+		W_CycleWeapon(self.weaponorder_byimpulse, +1);
 	else if(list == 2)
 		W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }
 
-string W_FixWeaponOrder_AllowIncomplete(string order)
-{
-	return W_FixWeaponOrder(order, 0);
-}
-
-string W_FixWeaponOrder_ForceComplete(string order)
-{
-	if(order == "")
-		order = W_NumberWeaponOrder(cvar_string("cl_weaponpriority"));
-	return W_FixWeaponOrder(order, 1);
-}
-
 float w_getbestweapon(entity e)
 {
 	return W_GetCycleWeapon(e, e.cvar_cl_weaponpriority, 0, -1, FALSE, TRUE);
@@ -293,7 +281,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 +373,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))