X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=4ab7abde4b200cf0bf122f2ef955408018ddc4d4;hb=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;hp=b5e245db6376b87373db2299c7ac259755961aa4;hpb=e3746a1f762597b2ca317c4914c052bf229b9f91;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index b5e245db63..4ab7abde4b 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -121,9 +121,9 @@ void W_NextWeaponOnImpulse(float imp)
 void W_NextWeapon(float list)
 {
 	if(list == 0)
-		W_CycleWeapon(weaponpriority_hudselector_0, -1);
+		W_CycleWeapon(weaponorder_byid, -1);
 	else if(list == 1)
-		W_CycleWeapon(weaponpriority_hudselector_1, -1);
+		W_CycleWeapon(weaponorder_byimpulse, -1);
 	else if(list == 2)
 		W_CycleWeapon(self.cvar_cl_weaponpriority, -1);
 }
@@ -132,9 +132,9 @@ void W_NextWeapon(float list)
 void W_PreviousWeapon(float list)
 {
 	if(list == 0)
-		W_CycleWeapon(weaponpriority_hudselector_0, +1);
+		W_CycleWeapon(weaponorder_byid, +1);
 	else if(list == 1)
-		W_CycleWeapon(weaponpriority_hudselector_1, +1);
+		W_CycleWeapon(weaponorder_byimpulse, +1);
 	else if(list == 2)
 		W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }
@@ -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)