X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=inline;f=data%2Fqcsrc%2Fserver%2Fcl_weaponsystem.qc;h=2e854b65d2d9a48d327da3d5237de727f4720b9c;hb=f6fb313876957ca2270250111ba2bb5f9f4024a6;hp=dfe547657b964cd614f3ee6cb15ca347fcf47c3a;hpb=fca531cc0ea0d14ccd28170a2781a3d66e3ba2d7;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index dfe54765..2e854b65 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -262,7 +262,7 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
 	}
 	if(other.spectatee_status)
 		other = other.enemy; // also do this for the player we are spectating
-	if(other.eater == self.owner)
+	if(other.predator == self.owner)
 	{
 		setmodel(self, "");
 		return TRUE;
@@ -971,7 +971,6 @@ void weapon_setup(float windex)
 	// the two weapon entities will notice this has changed and update their models
 	self.weapon = windex;
 	self.weaponname = e.mdl;
-	self.bulletcounter = 0;
 };
 
 // perform weapon to attack (weaponstate and attack_finished check is here)
@@ -1028,7 +1027,6 @@ float weapon_prepareattack(float secondary, float attacktime)
 		}
 		ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime * W_WeaponRateFactor();
 	}
-	self.bulletcounter += 1;
 	//dprint("attack finished ", ftos(ATTACK_FINISHED(self)), "\n");
 	return TRUE;
 };