X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=fbe6d7aea9dbda56745613bc34d0944d39c1cdad;hb=23ae96654035b8cda3da563f346b4507d04d73e8;hp=496b0973b41ca4cd0934ddb91935a281cf913544;hpb=65f71b6a7b489c6f5a2275928da75a672327a981;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 496b0973b4..fbe6d7aea9 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -262,22 +262,9 @@ void player_anim (void)
 
 void SpawnThrownWeapon (vector org, float w)
 {
-	if(g_pinata)
-	{
-		float j;
-		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-		{
-			if(WEPSET_CONTAINS_EW(self, j))
-				if(W_IsWeaponThrowable(j))
-					W_ThrowNewWeapon(self, j, FALSE, org, randomvec() * 175 + '0 0 325');
-		}
-	}
-	else
-	{
-		if(WEPSET_CONTAINS_EW(self, self.weapon))
-			if(W_IsWeaponThrowable(self.weapon))
-				W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
-	}
+	if(WEPSET_CONTAINS_EW(self, self.weapon))
+		if(W_IsWeaponThrowable(self.weapon))
+			W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
 }
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
@@ -416,6 +403,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	frag_inflictor = inflictor;
 	frag_attacker = attacker;
 	frag_target = self;
+	frag_damage = damage;
 	damage_take = take;
 	damage_save = save;
 	damage_force = force;
@@ -497,9 +485,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
 	self.dmg_inflictor = inflictor;
 
-	if(g_ca && self != attacker && IS_PLAYER(attacker))
-		PlayerTeamScore_Add(attacker, SP_SCORE, ST_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
-
 	float abot, vbot, awep;
 	abot = (IS_BOT_CLIENT(attacker));
 	vbot = (IS_BOT_CLIENT(self));