X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=057cc92cb91057536b60558cf1575cea797e8e8e;hb=13f5098bdbfeebe6dee4fb798eb36da7fdb98f4a;hp=f00d42df275b032424f099cf76910ef941b8b03a;hpb=5b9c815160b06ce5d741df5fb4497242c3419f9a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index f00d42df2..057cc92cb 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -274,8 +274,9 @@ void SpawnThrownWeapon (vector org, float w)
 	}
 	else
 	{
-		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');
 	}
 }
 
@@ -415,6 +416,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,7 +499,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	self.dmg_inflictor = inflictor;
 
 	if(g_ca && self != attacker && IS_PLAYER(attacker))
-		PlayerScore_Add(attacker, SP_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
+		PlayerTeamScore_Add(attacker, SP_SCORE, ST_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
 
 	float abot, vbot, awep;
 	abot = (IS_BOT_CLIENT(attacker));
@@ -581,7 +583,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		frag_deathtype = deathtype;
 		MUTATOR_CALLHOOK(PlayerDies);
 
-		weapon_action(self.weapon, WR_PLAYERDEATH);
+		WEP_ACTION(self.weapon, WR_PLAYERDEATH);
 
 		RemoveGrapplingHook(self);
 
@@ -681,7 +683,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// reset fields the weapons may use just in case
 		for (j = WEP_FIRST; j <= WEP_LAST; ++j)
 		{
-			weapon_action(j, WR_RESETPLAYER);
+			WEP_ACTION(j, WR_RESETPLAYER);
 			ATTACK_FINISHED_FOR(self, j) = 0;
 		}
 	}