X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_weaponsystem.qc;h=2b06fed1d0c13885be68dfac251dd6b81202afe8;hp=f5dab95734ba51b05773aec973f0fd5a905be392;hb=c24d48910a78565fdbb57fcb8ace9757a0040d4f;hpb=096a7e925f4d8607000aa2efed0a89e2349b61e4

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index f5dab957..2b06fed1 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -855,8 +855,9 @@ void CL_SpawnWeaponentity()
 
 float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 {
-	local float weaponbit, f;
-	local entity oldself;
+	local float weaponbit;
+	//local float weaponbit, f;
+	//local entity oldself;
 
 	if(time < self.hasweapon_complain_spam)
 		complain = 0;
@@ -872,7 +873,8 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 	weaponbit = W_WeaponBit(wpn);
 	if (cl.weapons & weaponbit)
 	{
-		if (andammo)
+		// since we don't have an infinite ammo weapon in vore tournament, allow switching to the grabber even when it has no ammo
+		/*if (andammo)
 		{
 			if(cl.items & IT_UNLIMITED_WEAPON_AMMO)
 			{
@@ -896,7 +898,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 				}
 				return FALSE;
 			}
-		}
+		}*/
 		return TRUE;
 	}
 	if (complain)
@@ -998,7 +1000,8 @@ float weapon_prepareattack_checkammo(float secondary)
 			self.prevdryfire = time;
 		}
 
-		W_SwitchToOtherWeapon(self);
+		// since we don't have an infinite ammo weapon in vore tournament, allow switching to the grabber even when it has no ammo
+		//W_SwitchToOtherWeapon(self);
 		return FALSE;
 	}
 	return TRUE;